sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2015-06-27 08:34:09 +00:00
parent ce10a63e67
commit 9a6c48790a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/pluggable.php
View File

@ -2235,6 +2235,8 @@ function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args =
return false; 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 ); $args = get_avatar_data( $id_or_email, $args );
$url = $args['url']; $url = $args['url'];
@ -2243,8 +2245,6 @@ function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args =
return false; return false;
} }
$url2x = add_query_arg( array( 's' => $args['size'] * 2 ), $args['url'] );
$class = array( 'avatar', 'avatar-' . (int) $args['size'], 'photo' ); $class = array( 'avatar', 'avatar-' . (int) $args['size'], 'photo' );
if ( ! $args['found_avatar'] || $args['force_default'] ) { if ( ! $args['found_avatar'] || $args['force_default'] ) {