From 4073ff026bcd0b43ed1ada1e0ca2c5c0a51d7658 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 14 Apr 2015 18:09:26 +0000
Subject: [PATCH] Force default avatar for HiDPI avatars on Discussion
 Settings.

props SergeyBiryukov.
fixes #31972.
Built from https://develop.svn.wordpress.org/trunk@32129


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

diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index ed44128dd9..41450fc4d8 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -272,7 +272,9 @@ foreach ( $avatar_defaults as $default_key => $default_name ) {
 	$avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='" . esc_attr($default_key) . "' {$selected}/> ";
 
 	$avatar = get_avatar( $user_email, $size, $default_key );
-	$avatar_list .= preg_replace("/src='(.+?)'/", "src='\$1&amp;forcedefault=1'", $avatar);
+	$avatar = preg_replace( "/src='(.+?)'/", "src='\$1&amp;forcedefault=1'", $avatar );
+	$avatar = preg_replace( "/srcset='(.+?) 2x'/", "srcset='\$1&amp;forcedefault=1 2x'", $avatar );
+	$avatar_list .= $avatar;
 
 	$avatar_list .= ' ' . $default_name . '</label>';
 	$avatar_list .= '<br />';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d1a8eef0bc..02265f3de0 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta4-32128';
+$wp_version = '4.2-beta4-32129';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.