Ticket #23482: 23482.3.patch

textpattern-importer.php

@@ -40 +40 @@
         }
 }
 
+if(!function_exists('get_comment_ID'))
+{
+        /**
+         * Get the comment ID for a comment based on author and date.
+         *
+         * @package WordPress
+         * @subpackage Textpattern_Import
+         *
+         * @global wpdb $wpdb WordPress database abstraction object.
+   *
+   * @param string $comment_author Author of the comment
+   * @param string $comment_date Date of the comment
+   * @return mixed Comment ID on success.
+         */
+        function get_comment_ID($comment_author, $comment_date)
+        {
+                global $wpdb;
+                $comment_author = stripslashes($comment_author);
+                $comment_date = stripslashes($comment_date);
+                return $wpdb->get_var( $wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_author = %s AND comment_date = %s", $comment_author, $comment_date) );
+        }
+}
+
 if(!function_exists('link_exists'))
 {
         /**
@@ -426 +449 @@
                                                         'comment_approved'      => $comment_approved);
                                 $comment = wp_filter_comment($comment);
 
-                                if ( $cinfo = comment_exists($name, $posted) ) {
+                                if ( comment_exists($name, $posted) ) {
                                         // Update comments
-                                        $comment['comment_ID'] = $cinfo;
+                                        $comment['comment_ID'] = get_comment_ID($name, $posted);
                                         $ret_id = wp_update_comment($comment);
                                 } else {
                                         // Insert comments