Changeset 32845

Timestamp:

06/18/2015 06:35:04 PM (9 years ago)

Author:

wonderboymusic

Message:

Make sure that all Gravatars are generated by get_avatar() or at least run through apply_filters( 'get_avatar', $avatar ) for the sake of extensibility.

Props miqrogroove, GlennM, SergeyBiryukov.
Fixes #22650.

Location:

trunk/src

Files:

• wp-admin/credits.php (modified) (2 diffs)
• wp-includes/feed.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)

trunk/src/wp-admin/credits.php

@@ -110 +110 @@
 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'] ) {
@@ -145 +143 @@
                 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 . '" srcset="' . $gravatar . $person_data[1] . '?s=' . $size * 2 . ' 2x" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
+                $size = 'compact' == $group_data['type'] ? 30 : 60;
+                $data = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
+                $size *= 2;
+                $data2x = get_avatar_data( $person_data[1] . '@md5.gravatar.com', array( 'size' => $size ) );
+                echo '<img src="' . esc_attr( $data['url'] ) . '" srcset="' . esc_attr( $data2x['url'] ) . ' 2x" class="gravatar" alt="' . esc_attr( $person_data[0] ) . '" /></a>' . "\n\t";
                 echo '<a class="web" href="' . sprintf( $credits['data']['profiles'], $person_data[2] ) . '">' . $person_data[0] . "</a>\n\t";
                 if ( ! $compact )

trunk/src/wp-includes/feed.php

@@ -103 +103 @@
     if ( $wp_query->have_posts() ) {
         $post_ids = array();
+        $post_times = array();
         foreach( $wp_query->posts as $post ) {
             $post_ids[] = $post->ID;

trunk/src/wp-includes/link-template.php

@@ -3651 +3651 @@
     );
 
-    $url = sprintf( 'http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash );
+    if ( is_ssl() ) {
+        $url = 'https://secure.gravatar.com/avatar/' . $email_hash;
+    } else {
+        $url = sprintf( 'http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash );
+    }
 
     $url = add_query_arg(