Ticket #7051: comment.diff

wp-includes/comment.php

@@ -354 +354 @@
                 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 = 'blacklist';
         }
 
         $approved = apply_filters('pre_comment_approved', $approved);
@@ -689 +689 @@
 
         $commentdata['comment_approved'] = wp_allow_comment($commentdata);
 
-        $comment_ID = wp_insert_comment($commentdata);
+        if ( 'blacklist' !== $commentdata['comment_approved'] )
+                $comment_ID = wp_insert_comment($commentdata);
 
         do_action('comment_post', $comment_ID, $commentdata['comment_approved']);
 
-        if ( 'spam' !== $commentdata['comment_approved'] ) { // If it's spam save it silently for later crunching
+        if ( 'blacklist' !== $commentdata['comment_approved'] && 'spam' !== $commentdata['comment_approved'] ) { // If it's spam or blacklisted don't notify anyone
                 if ( '0' == $commentdata['comment_approved'] )
                         wp_notify_moderator($comment_ID);