Changeset 7886

Timestamp:

05/04/2008 06:05:20 PM (17 years ago)

Author:

ryan

Message:

Add blank to default avatars. Rename default to Mystery Man. see #6802

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/options-discussion.php (modified) (3 diffs)
• wp-includes/images/blank.gif (added)
• wp-includes/pluggable.php (modified) (2 diffs)

trunk/wp-admin/includes/schema.php

@@ -255 +255 @@
 
     // 2.6
-    add_option('avatar_default', 'default');
+    add_option('avatar_default', 'mystery');
 
     // Delete unused options

trunk/wp-admin/options-discussion.php

@@ -79 +79 @@
 <h3><?php _e('Avatars') ?></h3>
 
-<p><?php _e('By default WordPress uses <a href="http://gravatar.com/">Gravatars</a> &#8212; short for Globally Recognized Avatars &#8212; for the pictures that show up next to comments. Plugins may override this.'); ?></p>
+<p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites.  Here you can enable the display of avatars for people who comment on your blog.'); ?></p>
 
 <?php // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that? ?>
@@ -118 +118 @@
 <?php
 $avatar_defaults = array(
-    'default' => __('Default'),
+    'mystery' => __('Mystery Man'),
+    'blank' => __('Blank'),
     'gravatar_default' => __('Gravatar Logo'),
     'identicon' => __('Identicon (Generated)'),
@@ -127 +128 @@
 $default = get_option('avatar_default');
 if ( empty($default) )
-    $default = 'default';
+    $default = 'mystery';
 $size = 32;
 $avatar_list = '';

trunk/wp-includes/pluggable.php

@@ -1247 +1247 @@
         $avatar_default = get_option('avatar_default');
         if ( empty($avatar_default) )
-            $default = 'default';
+            $default = 'mystery';
         else
             $default = $avatar_default;
@@ -1254 +1254 @@
     if ( 'custom' == $default )
         $default = add_query_arg( 's', $size, $defaults[$avatar_default][1] );
-    elseif ( 'default' == $default )
+    elseif ( 'mystery' == $default )
         $default = "http://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com')
+    elseif ( 'blank' == $default )
+        $default = get_option('siteurl') . '/wp-includes/images/blank.gif';
     elseif ( !empty($email) && 'gravatar_default' == $default )
         $default = '';