Ticket #1683: 1683.diff

wp-includes/functions-post.php

@@ -456 +456 @@
         return false;
 }
 
-function wp_new_comment( $commentdata, $spam = false ) {
+function wp_new_comment( $commentdata, $runchecks = true ) {
         global $wpdb;
 
         $commentdata = apply_filters('preprocess_comment', $commentdata);
@@ -485 +485 @@
                 $post_author = $wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = '$comment_post_ID' LIMIT 1");
         }
 
-        // Simple duplicate check
-        $dupe = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND ( comment_author = '$author' ";
-        if ( $email ) $dupe .= "OR comment_author_email = '$email' ";
-        $dupe .= ") AND comment_content = '$comment' LIMIT 1";
-        if ( $wpdb->get_var($dupe) )
-                die( __('Duplicate comment detected; it looks as though you\'ve already said that!') );
+        if ( $runchecks ) {
+                // Simple duplicate check
+                $dupe = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND ( comment_author = '$author' ";
+                if ( $email ) $dupe .= "OR comment_author_email = '$email' ";
+                $dupe .= ") AND comment_content = '$comment' LIMIT 1";
+                if ( $wpdb->get_var($dupe) )
+                        die( __('Duplicate comment detected; it looks as though you\'ve already said that!') );
 
-        // Simple flood-protection
-        if ( $lasttime = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_author_IP = '$user_ip' OR comment_author_email = '$email' ORDER BY comment_date DESC LIMIT 1") ) {
-                $time_lastcomment = mysql2date('U', $lasttime);
-                $time_newcomment  = mysql2date('U', $now_gmt);
-                if ( ($time_newcomment - $time_lastcomment) < 15 ) {
-                        do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
-                        die( __('Sorry, you can only post a new comment once every 15 seconds. Slow down cowboy.') );
+                // Simple flood-protection
+                if ( $lasttime = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_author_IP = '$user_ip' OR comment_author_email = '$email' ORDER BY comment_date DESC LIMIT 1") ) {
+                        $time_lastcomment = mysql2date('U', $lasttime);
+                        $time_newcomment  = mysql2date('U', $now_gmt);
+                        if ( ($time_newcomment - $time_lastcomment) < 15 ) {
+                                do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
+                                die( __('Sorry, you can only post a new comment once every 15 seconds. Slow down cowboy.') );
+                        }
                 }
-        }
 
-        if ( $userdata && ( $user_id == $post_author || $user->has_cap('level_9') ) ) {
+                if ( $userdata && ( $user_id == $post_author || $user->has_cap('level_9') ) ) {
+                        $approved = 1;
+                } else {
+                        if ( check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $comment_type) )
+                                $approved = 1;
+                        else
+                                $approved = 0;
+                        if ( wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_agent) )
+                                $approved = 'spam';
+                }
+
+                $approved = apply_filters('pre_comment_approved', $approved);
+        } else {
+                // Importers can make $runchecks false to ensuring comment approval.
                 $approved = 1;
-        } else {
-                if ( check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $comment_type) )
-                        $approved = 1;
-                else
-                        $approved = 0;
-                if ( wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_agent) )
-                        $approved = 'spam';
         }
 
-        $approved = apply_filters('pre_comment_approved', $approved);
-
         $result = $wpdb->query("INSERT INTO $wpdb->comments 
         (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_author_IP, comment_date, comment_date_gmt, comment_content, comment_approved, comment_agent, comment_type, user_id)
         VALUES 

wp-admin/import/blogger.php

@@ -500 +500 @@
                                                 if ( $comment_post_ID == comment_exists($comment_author, $comment_date) ) {
                                                         $skippedcommentcount++;
                                                 } else {
-                                                        $result = $wpdb->query("
-                                                        INSERT INTO $wpdb->comments 
-                                                        (comment_post_ID,comment_author,comment_author_url,comment_date,comment_content)
-                                                        VALUES 
-                                                                ('$comment_post_ID','$comment_author','$comment_author_url','$comment_date','$comment_content')
-                                                ");
+                                                        $commentdata = compact('comment_date', 'comment_author', 'comment_author_url', 'comment_content', 'comment_post_ID');
+                                                        wp_new_comment($commentdata, false);
                                                 }
                                                 $commentcount++;
                                         }
@@ -582 +578 @@
                 if ( count($this->import['blogs']) > 1 )
                         echo "<li>In case you haven't done it already, you can import the posts from any other blogs you may have:" . $this->show_blogs() . "</li>\n";
                 if ( $n = count($this->import['blogs'][$_GET['blog']]['newusers']) )
-                        echo "<li>Since we had to create $n new users, you probably want to go to <a href='users.php' target='_parent'>Authors & Users</a>, where you can give them new passwords or delete them. If you want to make all of the imported posts yours, you will be given that option when you delete the new authors.</li>\n";
+                        echo "<li>Since we had to create $n new user".($n > 1 ? 's' : '').", you probably want to go to <a href='users.php' target='_parent'>Authors & Users</a>, where you can give them new passwords or delete them. If you want to make all of the imported posts yours, you will be given that option when you delete the new authors.</li>\n";
                 
                 echo "\n<ul>";
         }