Wordpress 3.5

[autoinstalls/wordpress.git] / wp-admin / options-discussion.php

diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php
index 22039fd4271a2cf5054e55779b4d142b45f15b15..df14d51aab79cbc2432093689a50d33ff3debbd6 100644 (file)
--- a/wp-admin/options-discussion.php
+++ b/wp-admin/options-discussion.php
@@ -71,7 +71,8 @@ include('./admin-header.php');
 
 <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')); ?> />
 
 <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( __('Automatically close comments on articles older than %s days'), '</label><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" />'); ?>
+<?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="thread_comments">
 <input name="thread_comments" type="checkbox" id="thread_comments" value="1" <?php checked('1', get_option('thread_comments')); ?> />
 <br />
 <label for="thread_comments">
 <input name="thread_comments" type="checkbox" id="thread_comments" value="1" <?php checked('1', get_option('thread_comments')); ?> />


@@ -79,7 +80,7 @@ include('./admin-header.php');
 
 $maxdeep = (int) apply_filters( 'thread_comments_depth_max', 10 );
 
 
 $maxdeep = (int) apply_filters( 'thread_comments_depth_max', 10 );
 

-$thread_comments_depth = '</label><select name="thread_comments_depth" id="thread_comments_depth">';
+$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'";
 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'";


@@ -89,7 +90,8 @@ $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 );
 

-?><br />
+?></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
 <label for="page_comments">
 <input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked('1', get_option('page_comments')); ?> />
 <?php


@@ -172,13 +174,10 @@ printf( __('Comments should be displayed with the %s comments at the top of each
 <tr valign="top">
 <th scope="row"><?php _e('Avatar Display'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display'); ?></span></legend>
 <tr valign="top">
 <th scope="row"><?php _e('Avatar Display'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Avatar Display'); ?></span></legend>

-<?php
-       $yesorno = array( 0 => __( 'Don&#8217;t show Avatars' ), 1 => __( 'Show Avatars' ) );
-       foreach ( $yesorno as $key => $value) {
-               $selected = (get_option('show_avatars') == $key) ? 'checked="checked"' : '';
-               echo "\n\t<label><input type='radio' name='show_avatars' value='" . esc_attr($key) . "' $selected/> $value</label><br />";
-       }
-?>
+       <label for="show_avatars">
+               <input type="checkbox" id="show_avatars" name="show_avatars" value="1" <?php checked( get_option('show_avatars'), 1 ); ?> />
+               <?php _e( 'Show Avatars' ); ?>
+       </label>

 </fieldset></td>
 </tr>
 <tr valign="top">
 </fieldset></td>
 </tr>
 <tr valign="top">