Ticket #22650: 22650.3.diff

src/wp-admin/credits.php

@@ -111 +111 @@
 
 echo '<p class="about-description">' . __( 'WordPress is created by a worldwide team of passionate individuals.' ) . "</p>\n";
 
-$gravatar = is_ssl() ? 'https://secure.gravatar.com/avatar/' : 'http://0.gravatar.com/avatar/';
-
 foreach ( $credits['groups'] as $group_slug => $group_data ) {
         if ( $group_data['name'] ) {
                 if ( 'Translators' == $group_data['name'] ) {
@@ -147 +145 @@
                                 echo '<li class="wp-person" id="wp-person-' . $person_data[2] . '">' . "\n\t";
                                 echo '<a href="' . sprintf( $credits['data']['profiles'], $person_data[2] ) . '">';
                                 $size = 'compact' == $group_data['type'] ? '30' : '60';
-                                echo '<img src="' . $gravatar . $person_data[1] . '?s=' . $size . '" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
+                                echo get_avatar( $person_data[1], $size, '', $person_data[0] );
                                 echo '<a class="web" href="' . sprintf( $credits['data']['profiles'], $person_data[2] ) . '">' . $person_data[0] . "</a>\n\t";
                                 if ( ! $compact )
                                         echo '<span class="title">' . translate( $person_data[3] ) . "</span>\n";

src/wp-admin/css/about.css

@@ -268 +268 @@
         margin-right: 10px;
 }
 
-.about-wrap li.wp-person img.gravatar {
+.about-wrap li.wp-person img.avatar {
         float: left;
         margin: 0 10px 10px 0;
         padding: 2px;
@@ -276 +276 @@
         height: 60px;
 }
 
-.about-wrap ul.compact li.wp-person img.gravatar {
+.about-wrap ul.compact li.wp-person img.avatar {
         width: 30px;
         height: 30px;
 }

src/wp-includes/pluggable.php

@@ -2043 +2043 @@
  *
  * @since 2.5.0
  *
- * @param int|string|object $id_or_email A user ID,  email address, or comment object
+ * @param int|string|object $id_or_email A user ID, email address or MD5 hash, or comment object
  * @param int $size Size of the avatar image
  * @param string $default URL to a default image to use if no avatar is available
  * @param string $alt Alternative text to use in image tag. Defaults to blank
@@ -2102 +2102 @@
                         $default = $avatar_default;
         }
 
-        if ( !empty($email) )
-                $email_hash = md5( strtolower( trim( $email ) ) );
+        if ( ! empty( $email ) ) {
+                if ( preg_match( '/^[a-f0-9]{32}$/', $email ) ) {
+                        $email_hash = $email;
+                } else {
+                        $email_hash = md5( strtolower( trim( $email ) ) );
+                }
+        }
 
         if ( is_ssl() ) {
                 $host = 'https://secure.gravatar.com';
@@ -2149 +2154 @@
          * @since 2.5.0
          *
          * @param string            $avatar      Image tag for the user's avatar.
-         * @param int|object|string $id_or_email A user ID, email address, or comment object.
+         * @param int|object|string $id_or_email A user ID, email address or MD5 hash, or comment object.
          * @param int               $size        Square avatar width and height in pixels to retrieve.
          * @param string            $alt         Alternative text to use in the avatar image tag.
          *                                       Default empty.