From 026ed07458f2dd3e7c7d899ebb4198a3ecdf3589 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascal.birchler@gmail.com>
Date: Sun, 17 Apr 2016 10:19:28 +0000
Subject: [PATCH] Admin: Fix default avatar handling in Settings -> Discussion.

By passing the `force_default` argument to `get_avatar()` instead of using `preg_replace`, we make it easier for developers to override the output.

Props henry.wright.
Fixes #34744.
Built from https://develop.svn.wordpress.org/trunk@37227


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

diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 3d59195fd4..27248eaa58 100644
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -240,7 +240,6 @@ $avatar_defaults = array(
  */
 $avatar_defaults = apply_filters( 'avatar_defaults', $avatar_defaults );
 $default = get_option( 'avatar_default', 'mystery' );
-$size = 32;
 $avatar_list = '';
 
 // Force avatars on to display these choices
@@ -249,12 +248,7 @@ add_filter( 'pre_option_show_avatars', '__return_true', 100 );
 foreach ( $avatar_defaults as $default_key => $default_name ) {
 	$selected = ($default == $default_key) ? 'checked="checked" ' : '';
 	$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 = 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 .= get_avatar( $user_email, 32, $default_key, '', array( 'force_default' => true ) );
 	$avatar_list .= ' ' . $default_name . '</label>';
 	$avatar_list .= '<br />';
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 26ef866502..65e86e352d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37226';
+$wp_version = '4.6-alpha-37227';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.