Skip to content

Commit 3f0ca00

Browse files
ryanborenryanboren
committed
Move 'Users must be registered and logged in to comment' setting to Discussion page. Props MtDewVirus. fixes WordPress#6652
git-svn-id: https://develop.svn.wordpress.org/trunk@9368 602fd350-edb4-49c9-b593-d223f7449a82
1 parent c5c2377 commit 3f0ca00

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

‎wp-admin/options-discussion.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@
4747
<td><fieldset><legend class="hidden"><?php _e('Other comment settings') ?></legend>
4848
<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 e-mail') ?></label>
4949
<br />
50+
<label for="comment_registration">
51+
<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
52+
<?php _e('Users must be registered and logged in to comment') ?>
53+
</label>
54+
<br />
55+
5056
<label for="close_comments_for_old_posts">
5157
<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')); ?> />
5258
<?php printf( __('Automatically close comments on articles older than %s days'), '</label><input name="close_comments_days_old" type="text" id="close_comments_days_old" value="' . attribute_escape(get_option('close_comments_days_old')) . '" size="3" />') ?>

‎wp-admin/options-general.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,7 @@ function add_js() {
8282
<th scope="row"><?php _e('Membership') ?></th>
8383
<td> <fieldset><legend class="hidden"><?php _e('Membership') ?></legend><label for="users_can_register">
8484
<input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_option('users_can_register')); ?> />
85-
<?php _e('Anyone can register') ?></label><br />
86-
<label for="comment_registration">
87-
<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
88-
<?php _e('Users must be registered and logged in to comment') ?>
89-
</label>
85+
<?php _e('Anyone can register') ?></label>
9086
</fieldset></td>
9187
</tr>
9288
<tr valign="top">

‎wp-admin/options.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
wp_reset_vars(array('action'));
2323

2424
$whitelist_options = array(
25-
'general' => array('blogname', 'blogdescription', 'admin_email', 'users_can_register', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'comment_registration', 'default_role' ),
26-
'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order' ),
25+
'general' => array( 'blogname', 'blogdescription', 'admin_email', 'users_can_register', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'default_role' ),
26+
'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
2727
'misc' => array( 'hack_file', 'use_linksupdate', 'uploads_use_yearmonth_folders', 'upload_path' ),
2828
'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
2929
'privacy' => array( 'blog_public' ),

0 commit comments

Comments
 (0)