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.

Built from https://develop.svn.wordpress.org/trunk@34726


git-svn-id: http://core.svn.wordpress.org/trunk@34690 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/options-discussion.php

@@ -158,7 +158,7 @@ printf( __('Comments should be displayed with the %s comments at the top of each
 <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, 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>
 </p>

wp-includes/comment-functions.php

@@ -673,7 +673,7 @@ function wp_allow_comment( $commentdata ) {
 			$commentdata['comment_author_IP'],
 			$commentdata['comment_agent']
 		) ) {
-			$approved = 'spam';
+			$approved = EMPTY_TRASH_DAYS ? 'trash' : 'spam';
 		}
 	}
 

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34725';
+$wp_version = '4.4-alpha-34726';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.