Ticket #10931: 10931.diff

wp-includes/comment.php

@@ -1330 +1330 @@
         $commentdata['comment_date_gmt'] = current_time('mysql', 1);
 
         $commentdata = wp_filter_comment($commentdata);
-
-        $commentdata['comment_approved'] = wp_allow_comment($commentdata);
-
+        
         $comment_ID = wp_insert_comment($commentdata);
 
         do_action('comment_post', $comment_ID, $commentdata['comment_approved']);

wp-comments-post.php

@@ -85 +85 @@
 
 $comment_parent = isset($_POST['comment_parent']) ? absint($_POST['comment_parent']) : 0;
 
-$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
+$comment_approved = wp_allow_comment($commentdata);
+if( get_user_by( 'email', $comment_author_email ) && 'spam' !== $comment_approved )
+        $comment_approved = 0;
 
+$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_approved', 'comment_type', 'comment_parent', 'user_ID');
+
 $comment_id = wp_new_comment( $commentdata );
 
 $comment = get_comment($comment_id);