Ticket #23233: 23233.2.diff

src/wp-admin/includes/upgrade.php

@@ -552 +552 @@
         if ( $wp_current_db_version < 36686 )
                 upgrade_450();
 
+        if ( $wp_current_db_version < 37183 )
+                upgrade_460();
+
         maybe_disable_link_manager();
 
         maybe_disable_automattic_widgets();
@@ -1687 +1690 @@
         delete_user_setting( 'wplink' );
 }
 
+function upgrade_460() {
+        // Comment moderation now lives under a single option.
+        if ( get_option( 'comment_moderation' ) ) {
+                update_option( 'comment_moderation', 'manually_approve' );
+        } else if ( get_option( 'comment_whitelist' ) ) {
+                update_option( 'comment_moderation', 'whitelist_previous_commenters' );
+        }
+        delete_option( 'comment_whitelist' );
+}
 /**
  * Executes network-level upgrade routines.
  *

src/wp-admin/options-discussion.php

@@ -137 +137 @@
 </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>
-<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>
-<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>
-</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>
+<label for="comment_moderation_manually_approved">
+        <input name="comment_moderation" id="comment_moderation_manually_approved" type="radio" value="manually_approve" <?php checked( 'manually_approve', get_option( 'comment_moderation' ) ) ?> />
+        <?php _e( 'All comments must be manually approved' ); ?>
+</label>
+<br />
+<label for="comment_moderation_whitelist_previous_commenters">
+        <input name="comment_moderation" id="comment_moderation_whitelist_previous_commenters" type="radio" value="whitelist_previous_commenters" <?php checked( 'whitelist_previous_commenters', get_option( 'comment_moderation' ) ) ?> />
+        <?php _e( 'Only comments by new commenters must be approved' ); ?>
+</label>
+<br />
+<label for="comment_moderation_approve_all">
+        <input name="comment_moderation" id="comment_moderation_approve_all" type="radio" value="approve_all" <?php checked( 'approve_all', get_option( 'comment_moderation' ) ) ?> />
+        <?php _e( 'All comments are automatically approved' ); ?>
+</label>
 <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, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>

src/wp-admin/options.php

@@ -83 +83 @@
 
 $whitelist_options = array(
         'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
-        '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' ),
+        'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', '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' ),
         'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'medium_large_size_w', 'medium_large_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
         'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
         'writing' => array( 'default_category', 'default_email_category', 'default_link_category', 'default_post_format' )

src/wp-includes/comment.php

@@ -40 +40 @@
         global $wpdb;
 
         // If manual moderation is enabled, skip all checks and return false.
-        if ( 1 == get_option('comment_moderation') )
+        if ( 'manually_approve' == get_option( 'comment_moderation' ) )
                 return false;
 
         /** This filter is documented in wp-includes/comment-template.php */
@@ -108 +108 @@
          * as well as whether there are any moderation keywords (if set) present in the author
          * email address. If both checks pass, return true. Otherwise, return false.
          */
-        if ( 1 == get_option('comment_whitelist')) {
+        if ( 'whitelist_previous_commenters' == get_option('comment_moderation') ) {
                 if ( 'trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '' ) {
                         // expected_slashed ($author, $email)
                         $ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1");