Ticket #34744: 34744.2.diff

src/wp-admin/options-discussion.php

@@ -240 +240 @@
  */
 $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 +248 @@
 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 />';
 }