Ticket #7051: 7051.diff

wp-includes/comment.php

@@ -636 +636 @@
                 else
                         $approved = 0;
                 if ( wp_blacklist_check($comment_author, $comment_author_email, $comment_author_url, $comment_content, $comment_author_IP, $comment_agent) )
-                        $approved = 'spam';
+                        $approved = 'trash';
         }
 
         $approved = apply_filters( 'pre_comment_approved', $approved, $commentdata );

wp-admin/options-discussion.php

@@ -148 +148 @@
 <tr valign="top">
 <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, e-mail, 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, e-mail, 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>