Ticket #21195: 21195.16.diff

src/wp-admin/options-discussion.php

@@ -264 +264 @@
 $size = 32;
 $avatar_list = '';
 
-// Force avatars on to display these choices
-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 = get_avatar( $user_email, $size, $default_key, '', array( 'force_default' => true, 'force_display' => true ) );
         $avatar_list .= preg_replace("/src='(.+?)'/", "src='\$1&amp;forcedefault=1'", $avatar);
 
         $avatar_list .= ' ' . $default_name . '</label>';
         $avatar_list .= '<br />';
 }
 
-remove_filter( 'pre_option_show_avatars', '__return_true', 100 );
-
 /**
  * Filter the HTML output of the default avatar list.
  *