Changeset 32702 for trunk/src/wp-includes/pluggable.php

Timestamp:

06/07/2015 02:57:11 PM (10 years ago)

Author:

SergeyBiryukov

Message:

In get_avatar(), avoid a second get_avatar_data() call to get the 2x URL.

props ravinderk.
fixes #32572.

File:

• trunk/src/wp-includes/pluggable.php (modified) (2 diffs)

trunk/src/wp-includes/pluggable.php

@@ -2230 +2230 @@
     }
 
-    $url2x = get_avatar_url( $id_or_email, array_merge( $args, array( 'size' => $args['size'] * 2 ) ) );
-
     $args = get_avatar_data( $id_or_email, $args );
 
@@ -2237 +2235 @@
 
     if ( ! $url || is_wp_error( $url ) ) {
-        return false;
-    }
+        return false;
+    }
+
+    $url2x = add_query_arg( array( 's' => $args['size'] * 2 ), $args['url'] );
 
     $class = array( 'avatar', 'avatar-' . (int) $args['size'], 'photo' );
 
     if ( ! $args['found_avatar'] || $args['force_default'] ) {
-        $class[] = 'avatar-default';
+        $class[] = 'avatar-default';
     }