Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-31 21:48:36 +01:00
Code Issues Projects 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.

Browse Source 
see #32572.
Built from https://develop.svn.wordpress.org/trunk@32969


git-svn-id: http://core.svn.wordpress.org/trunk@32940 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-06-27 08:35:24 +00:00
parent 81d0434421
commit 74c7f59bb2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/pluggable.php
View File

@ -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'] ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-alpha-32968';
$wp_version = '4.3-alpha-32969';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.