Changeset 34726

Timestamp:

10/01/2015 01:48:14 AM (9 years ago)

Author:

helen

Message:

Comments: Trash blacklisted comments by default.

If trash is disabled, they wil continue to go into spam like they do now.

props wonderboymusic, solarissmoke, MikeHansenMe.
fixes #7051.

Location:

trunk/src

Files:

• wp-admin/options-discussion.php (modified) (1 diff)
• wp-includes/comment-functions.php (modified) (1 diff)

trunk/src/wp-admin/options-discussion.php

@@ -159 +159 @@
 <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, it will be marked as spam. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
+<p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP, it will be put in the trash. One word or IP 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>

trunk/src/wp-includes/comment-functions.php

@@ -674 +674 @@
             $commentdata['comment_agent']
         ) ) {
-            $approved = 'spam';
+            $approved = EMPTY_TRASH_DAYS ? 'trash' : 'spam';
         }
     }