From 74c7f59bb2ccbe22e3c02e16cb655b1b381117e4 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 27 Jun 2015 08:35:24 +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.
Built from https://develop.svn.wordpress.org/trunk@32969


git-svn-id: http://core.svn.wordpress.org/trunk@32940 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/pluggable.php | 4 ++--
 wp-includes/version.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index 06cfee79f3..f0934588bd 100644
--- a/wp-includes/pluggable.php
+++ b/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'] ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 474fa91d4e..e10fc096ca 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -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.