diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/options-discussion.php
--- a/wp/wp-admin/options-discussion.php	Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/options-discussion.php	Mon Oct 14 18:28:13 2019 +0200
@@ -8,25 +8,28 @@
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+}
 
-$title = __('Discussion Settings');
+$title       = __( 'Discussion Settings' );
 $parent_file = 'options-general.php';
 
 add_action( 'admin_print_footer_scripts', 'options_discussion_add_js' );
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation links to get information on what each discussion setting does.') . '</p>' .
-		'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => '<p>' . __( 'This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation links to get information on what each discussion setting does.' ) . '</p>' .
+			'<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>',
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Discussion_Screen">Documentation on Discussion Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Settings_Discussion_Screen">Documentation on Discussion Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
 );
 
 include( ABSPATH . 'wp-admin/admin-header.php' );
@@ -36,61 +39,66 @@
 <h1><?php echo esc_html( $title ); ?></h1>
 
 <form method="post" action="options.php">
-<?php settings_fields('discussion'); ?>
+<?php settings_fields( 'discussion' ); ?>
 
-<table class="form-table">
+<table class="form-table" role="presentation">
 <tr>
-<th scope="row"><?php _e('Default article settings'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Default article settings'); ?></span></legend>
+<th scope="row"><?php _e( 'Default article settings' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Default article settings' ); ?></span></legend>
 <label for="default_pingback_flag">
-<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> />
-<?php _e('Attempt to notify any blogs linked to from the article'); ?></label>
+<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked( '1', get_option( 'default_pingback_flag' ) ); ?> />
+<?php _e( 'Attempt to notify any blogs linked to from the article' ); ?></label>
 <br />
 <label for="default_ping_status">
-<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> />
-<?php _e('Allow link notifications from other blogs (pingbacks and trackbacks) on new articles'); ?></label>
+<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked( 'open', get_option( 'default_ping_status' ) ); ?> />
+<?php _e( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles' ); ?></label>
 <br />
 <label for="default_comment_status">
-<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> />
-<?php _e('Allow people to post comments on new articles'); ?></label>
+<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked( 'open', get_option( 'default_comment_status' ) ); ?> />
+<?php _e( 'Allow people to post comments on new articles' ); ?></label>
 <br />
 <p class="description"><?php echo '(' . __( 'These settings may be overridden for individual articles.' ) . ')'; ?></p>
 </fieldset></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Other comment settings'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Other comment settings'); ?></span></legend>
-<label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and email'); ?></label>
+<th scope="row"><?php _e( 'Other comment settings' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Other comment settings' ); ?></span></legend>
+<label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked( '1', get_option( 'require_name_email' ) ); ?> /> <?php _e( 'Comment author must fill out name and email' ); ?></label>
 <br />
 <label for="comment_registration">
-<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
-<?php _e('Users must be registered and logged in to comment'); ?>
-<?php if ( !get_option( 'users_can_register' ) && is_multisite() ) echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' ); ?>
+<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked( '1', get_option( 'comment_registration' ) ); ?> />
+<?php _e( 'Users must be registered and logged in to comment' ); ?>
+<?php
+if ( ! get_option( 'users_can_register' ) && is_multisite() ) {
+	echo ' ' . __( '(Signup has been disabled. Only members of this site can comment.)' );}
+?>
 </label>
 <br />
 
 <label for="close_comments_for_old_posts">
-<input name="close_comments_for_old_posts" type="checkbox" id="close_comments_for_old_posts" value="1" <?php checked('1', get_option('close_comments_for_old_posts')); ?> />
-<?php printf(
+<input name="close_comments_for_old_posts" type="checkbox" id="close_comments_for_old_posts" value="1" <?php checked( '1', get_option( 'close_comments_for_old_posts' ) ); ?> />
+<?php
+printf(
 	__( 'Automatically close comments on articles older than %s days' ),
 	'</label> <label for="close_comments_days_old"><input name="close_comments_days_old" type="number" min="0" step="1" id="close_comments_days_old" value="' . esc_attr( get_option( 'close_comments_days_old' ) ) . '" class="small-text" />'
-); ?>
+);
+?>
 </label>
 <br />
 
 <label for="show_comments_cookies_opt_in">
 <input name="show_comments_cookies_opt_in" type="checkbox" id="show_comments_cookies_opt_in" value="1" <?php checked( '1', get_option( 'show_comments_cookies_opt_in' ) ); ?> />
-<?php _e( 'Show comments cookies opt-in checkbox.' ); ?>
+<?php _e( 'Show comments cookies opt-in checkbox, allowing comment author cookies to be set.' ); ?>
 </label>
 <br />
 
 <label for="thread_comments">
-<input name="thread_comments" type="checkbox" id="thread_comments" value="1" <?php checked('1', get_option('thread_comments')); ?> />
+<input name="thread_comments" type="checkbox" id="thread_comments" value="1" <?php checked( '1', get_option( 'thread_comments' ) ); ?> />
 <?php
 /**
  * Filters the maximum depth of threaded/nested comments.
  *
- * @since 2.7.0.
+ * @since 2.7.0
  *
  * @param int $max_depth The maximum depth of threaded comments. Default 10.
  */
@@ -98,148 +106,168 @@
 
 $thread_comments_depth = '</label> <label for="thread_comments_depth"><select name="thread_comments_depth" id="thread_comments_depth">';
 for ( $i = 2; $i <= $maxdeep; $i++ ) {
-	$thread_comments_depth .= "<option value='" . esc_attr($i) . "'";
-	if ( get_option('thread_comments_depth') == $i ) $thread_comments_depth .= " selected='selected'";
+	$thread_comments_depth .= "<option value='" . esc_attr( $i ) . "'";
+	if ( get_option( 'thread_comments_depth' ) == $i ) {
+		$thread_comments_depth .= " selected='selected'";
+	}
 	$thread_comments_depth .= ">$i</option>";
 }
 $thread_comments_depth .= '</select>';
 
-printf( __('Enable threaded (nested) comments %s levels deep'), $thread_comments_depth );
+printf( __( 'Enable threaded (nested) comments %s levels deep' ), $thread_comments_depth );
 
-?></label>
+?>
+</label>
 <br />
 <label for="page_comments">
 <input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked( '1', get_option( 'page_comments' ) ); ?> />
 <?php
 $default_comments_page = '</label> <label for="default_comments_page"><select name="default_comments_page" id="default_comments_page"><option value="newest"';
-if ( 'newest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
-$default_comments_page .= '>' . __('last') . '</option><option value="oldest"';
-if ( 'oldest' == get_option('default_comments_page') ) $default_comments_page .= ' selected="selected"';
-$default_comments_page .= '>' . __('first') . '</option></select>';
+if ( 'newest' == get_option( 'default_comments_page' ) ) {
+	$default_comments_page .= ' selected="selected"';
+}
+$default_comments_page .= '>' . __( 'last' ) . '</option><option value="oldest"';
+if ( 'oldest' == get_option( 'default_comments_page' ) ) {
+	$default_comments_page .= ' selected="selected"';
+}
+$default_comments_page .= '>' . __( 'first' ) . '</option></select>';
 printf(
 	/* translators: 1: Form field control for number of top level comments per page, 2: Form field control for the 'first' or 'last' page */
 	__( 'Break comments into pages with %1$s top level comments per page and the %2$s page displayed by default' ),
 	'</label> <label for="comments_per_page"><input name="comments_per_page" type="number" step="1" min="0" id="comments_per_page" value="' . esc_attr( get_option( 'comments_per_page' ) ) . '" class="small-text" />',
 	$default_comments_page
 );
-?></label>
+?>
+</label>
 <br />
-<label for="comment_order"><?php
+<label for="comment_order">
+<?php
 
 $comment_order = '<select name="comment_order" id="comment_order"><option value="asc"';
-if ( 'asc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
-$comment_order .= '>' . __('older') . '</option><option value="desc"';
-if ( 'desc' == get_option('comment_order') ) $comment_order .= ' selected="selected"';
-$comment_order .= '>' . __('newer') . '</option></select>';
+if ( 'asc' == get_option( 'comment_order' ) ) {
+	$comment_order .= ' selected="selected"';
+}
+$comment_order .= '>' . __( 'older' ) . '</option><option value="desc"';
+if ( 'desc' == get_option( 'comment_order' ) ) {
+	$comment_order .= ' selected="selected"';
+}
+$comment_order .= '>' . __( 'newer' ) . '</option></select>';
 
-printf( __('Comments should be displayed with the %s comments at the top of each page'), $comment_order );
+printf( __( 'Comments should be displayed with the %s comments at the top of each page' ), $comment_order );
 
-?></label>
+?>
+</label>
 </fieldset></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Email me whenever'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Email me whenever'); ?></span></legend>
+<th scope="row"><?php _e( 'Email me whenever' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Email me whenever' ); ?></span></legend>
 <label for="comments_notify">
-<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> />
-<?php _e('Anyone posts a comment'); ?> </label>
+<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked( '1', get_option( 'comments_notify' ) ); ?> />
+<?php _e( 'Anyone posts a comment' ); ?> </label>
 <br />
 <label for="moderation_notify">
-<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_option('moderation_notify')); ?> />
-<?php _e('A comment is held for moderation'); ?> </label>
+<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked( '1', get_option( 'moderation_notify' ) ); ?> />
+<?php _e( 'A comment is held for moderation' ); ?> </label>
 </fieldset></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Before a comment appears'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Before a comment appears'); ?></span></legend>
+<th scope="row"><?php _e( 'Before a comment appears' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Before a comment appears' ); ?></span></legend>
 <label for="comment_moderation">
-<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_option('comment_moderation')); ?> />
-<?php _e('Comment must be manually approved'); ?> </label>
+<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked( '1', get_option( 'comment_moderation' ) ); ?> />
+<?php _e( 'Comment must be manually approved' ); ?> </label>
 <br />
-<label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_option('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment'); ?></label>
+<label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked( '1', get_option( 'comment_whitelist' ) ); ?> /> <?php _e( 'Comment author must have a previously approved comment' ); ?></label>
 </fieldset></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Comment Moderation'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation'); ?></span></legend>
-<p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ); ?></label></p>
+<th scope="row"><?php _e( 'Comment Moderation' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Moderation' ); ?></span></legend>
+<p><label for="comment_max_links"><?php printf( __( 'Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)' ), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr( get_option( 'comment_max_links' ) ) . '" class="small-text" />' ); ?></label></p>
 
-<p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP address, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
+<p><label for="moderation_keys"><?php _e( 'When a comment contains any of these words in its content, name, URL, email, or IP address, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.' ); ?></label></p>
 <p>
 <textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
 </p>
 </fieldset></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Comment Blacklist'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
-<p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP address, it will be put in the trash. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
+<th scope="row"><?php _e( 'Comment Blacklist' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Comment Blacklist' ); ?></span></legend>
+<p><label for="blacklist_keys"><?php _e( 'When a comment contains any of these words in its content, name, URL, email, or IP address, it will be put in the trash. One word or IP address per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.' ); ?></label></p>
 <p>
 <textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
 </p>
 </fieldset></td>
 </tr>
-<?php do_settings_fields('discussion', 'default'); ?>
+<?php do_settings_fields( 'discussion', 'default' ); ?>
 </table>
 
-<h2 class="title"><?php _e('Avatars'); ?></h2>
+<h2 class="title"><?php _e( 'Avatars' ); ?></h2>
 
-<p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.'); ?></p>
+<p><?php _e( 'An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.' ); ?></p>
 
 <?php
 // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that?
 
-$show_avatars = get_option( 'show_avatars' );
+$show_avatars       = get_option( 'show_avatars' );
+$show_avatars_class = '';
+if ( ! $show_avatars ) {
+	$show_avatars_class = ' hide-if-js';
+}
 ?>
 
-<table class="form-table">
+<table class="form-table" role="presentation">
 <tr>
-<th scope="row"><?php _e('Avatar Display'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display'); ?></span></legend>
+<th scope="row"><?php _e( 'Avatar Display' ); ?></th>
+<td>
 	<label for="show_avatars">
 		<input type="checkbox" id="show_avatars" name="show_avatars" value="1" <?php checked( $show_avatars, 1 ); ?> />
 		<?php _e( 'Show Avatars' ); ?>
 	</label>
-</fieldset></td>
+</td>
 </tr>
-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
-<th scope="row"><?php _e('Maximum Rating'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('Maximum Rating'); ?></span></legend>
+<tr class="avatar-settings<?php echo $show_avatars_class; ?>">
+<th scope="row"><?php _e( 'Maximum Rating' ); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Maximum Rating' ); ?></span></legend>
 
 <?php
 $ratings = array(
 	/* translators: Content suitability rating: https://en.wikipedia.org/wiki/Motion_Picture_Association_of_America_film_rating_system */
-	'G' => __('G &#8212; Suitable for all audiences'),
+	'G'  => __( 'G &#8212; Suitable for all audiences' ),
 	/* translators: Content suitability rating: https://en.wikipedia.org/wiki/Motion_Picture_Association_of_America_film_rating_system */
-	'PG' => __('PG &#8212; Possibly offensive, usually for audiences 13 and above'),
+	'PG' => __( 'PG &#8212; Possibly offensive, usually for audiences 13 and above' ),
 	/* translators: Content suitability rating: https://en.wikipedia.org/wiki/Motion_Picture_Association_of_America_film_rating_system */
-	'R' => __('R &#8212; Intended for adult audiences above 17'),
+	'R'  => __( 'R &#8212; Intended for adult audiences above 17' ),
 	/* translators: Content suitability rating: https://en.wikipedia.org/wiki/Motion_Picture_Association_of_America_film_rating_system */
-	'X' => __('X &#8212; Even more mature than above')
+	'X'  => __( 'X &#8212; Even more mature than above' ),
 );
-foreach ($ratings as $key => $rating) :
-	$selected = (get_option('avatar_rating') == $key) ? 'checked="checked"' : '';
-	echo "\n\t<label><input type='radio' name='avatar_rating' value='" . esc_attr($key) . "' $selected/> $rating</label><br />";
+foreach ( $ratings as $key => $rating ) :
+	$selected = ( get_option( 'avatar_rating' ) == $key ) ? 'checked="checked"' : '';
+	echo "\n\t<label><input type='radio' name='avatar_rating' value='" . esc_attr( $key ) . "' $selected/> $rating</label><br />";
 endforeach;
 ?>
 
 </fieldset></td>
 </tr>
-<tr class="avatar-settings<?php if ( ! $show_avatars ) echo ' hide-if-js'; ?>">
-<th scope="row"><?php _e('Default Avatar'); ?></th>
-<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
+<tr class="avatar-settings<?php echo $show_avatars_class; ?>">
+<th scope="row"><?php _e( 'Default Avatar' ); ?></th>
+<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e( 'Default Avatar' ); ?></span></legend>
 
-<?php _e('For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their email address.'); ?><br />
+<p>
+<?php _e( 'For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their email address.' ); ?><br />
+</p>
 
 <?php
 $avatar_defaults = array(
-	'mystery' => __('Mystery Person'),
-	'blank' => __('Blank'),
-	'gravatar_default' => __('Gravatar Logo'),
-	'identicon' => __('Identicon (Generated)'),
-	'wavatar' => __('Wavatar (Generated)'),
-	'monsterid' => __('MonsterID (Generated)'),
-	'retro' => __('Retro (Generated)')
+	'mystery'          => __( 'Mystery Person' ),
+	'blank'            => __( 'Blank' ),
+	'gravatar_default' => __( 'Gravatar Logo' ),
+	'identicon'        => __( 'Identicon (Generated)' ),
+	'wavatar'          => __( 'Wavatar (Generated)' ),
+	'monsterid'        => __( 'MonsterID (Generated)' ),
+	'retro'            => __( 'Retro (Generated)' ),
 );
 /**
  * Filters the default avatars.
@@ -249,18 +277,18 @@
  *
  * @since 2.6.0
  *
- * @param array $avatar_defaults Array of default avatars.
+ * @param string[] $avatar_defaults Associative array of default avatars.
  */
 $avatar_defaults = apply_filters( 'avatar_defaults', $avatar_defaults );
-$default = get_option( 'avatar_default', 'mystery' );
-$avatar_list = '';
+$default         = get_option( 'avatar_default', 'mystery' );
+$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}/> ";
+	$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_list .= get_avatar( $user_email, 32, $default_key, '', array( 'force_default' => true ) );
 	$avatar_list .= ' ' . $default_name . '</label>';
 	$avatar_list .= '<br />';
@@ -280,10 +308,10 @@
 
 </fieldset></td>
 </tr>
-<?php do_settings_fields('discussion', 'avatars'); ?>
+<?php do_settings_fields( 'discussion', 'avatars' ); ?>
 </table>
 
-<?php do_settings_sections('discussion'); ?>
+<?php do_settings_sections( 'discussion' ); ?>
 
 <?php submit_button(); ?>
 </form>