From 9a6c48790a8264fbcd13aab7b0a1f2678870b18e Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 27 Jun 2015 08:34:09 +0000 Subject: [PATCH] Revert [32702]. The URL may not have an `s` parameter as there are filters in place so that a plugin can return a URL with a completely different structure. see #32572. git-svn-id: https://develop.svn.wordpress.org/trunk@32969 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/pluggable.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/pluggable.php b/src/wp-includes/pluggable.php index 06cfee79f3..f0934588bd 100644 --- a/src/wp-includes/pluggable.php +++ b/src/wp-includes/pluggable.php @@ -2235,6 +2235,8 @@ 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']; @@ -2243,8 +2245,6 @@ function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args = 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'] ) {