From 9dcaac39e2feba7faf9d3da973f0a6118c8ba99c Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 7 Jun 2015 14:57:11 +0000 Subject: [PATCH] In `get_avatar()`, avoid a second `get_avatar_data()` call to get the 2x URL. props ravinderk. fixes #32572. git-svn-id: https://develop.svn.wordpress.org/trunk@32702 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/pluggable.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/pluggable.php b/src/wp-includes/pluggable.php index a166ab017a..7870e2fd48 100644 --- a/src/wp-includes/pluggable.php +++ b/src/wp-includes/pluggable.php @@ -2229,20 +2229,20 @@ function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args = return false; } - $url2x = get_avatar_url( $id_or_email, array_merge( $args, array( 'size' => $args['size'] * 2 ) ) ); - $args = get_avatar_data( $id_or_email, $args ); $url = $args['url']; 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'; } if ( $args['class'] ) {