Changeset 12270

Timestamp:

11/24/2009 02:40:25 PM (16 years ago)

Author:

ryan

Message:

Filter imported comments

Location:

trunk/wp-admin/import

Files:

• blogger.php (modified) (1 diff)
• dotclear.php (modified) (2 diffs)
• livejournal.php (modified) (1 diff)
• textpattern.php (modified) (1 diff)

trunk/wp-admin/import/blogger.php

@@ -623 +623 @@
             $comment = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_date', 'comment_content');
 
+            $comment = wp_filter_comment($comment);
             $comment_id = wp_insert_comment($comment);
 

trunk/wp-admin/import/dotclear.php

@@ -414 +414 @@
                 $message = $wpdb->escape(textconv ($comment_content));
 
-                if($cinfo = comment_exists($name, $comment_dt))
-                {
-                    // Update comments
-                    $ret_id = wp_update_comment(array(
-                            'comment_ID'        => $cinfo,
+                $comment = array(
                             'comment_post_ID'   => $comment_post_ID,
                             'comment_author'    => $name,
@@ -427 +423 @@
                             'comment_date_gmt'  => $comment_dt,
                             'comment_content'   => $message,
-                            'comment_approved'  => $comment_approved)
-                            );
-                }
-                else
-                {
+                            'comment_approved'  => $comment_approved);
+                $comment = wp_filter_comment($comment);
+
+                if ( $cinfo = comment_exists($name, $comment_dt) ) {
+                    // Update comments
+                    $comment['comment_ID'] = $cinfo;
+                    $ret_id = wp_update_comment($comment);
+                } else {
                     // Insert comments
-                    $ret_id = wp_insert_comment(array(
-                            'comment_post_ID'   => $comment_post_ID,
-                            'comment_author'    => $name,
-                            'comment_author_email'  => $email,
-                            'comment_author_url'    => $web,
-                            'comment_author_IP' => $comment_ip,
-                            'comment_date'      => $comment_dt,
-                            'comment_date_gmt'  => $comment_dt,
-                            'comment_content'   => $message,
-                            'comment_approved'  => $comment_approved)
-                            );
+                    $ret_id = wp_insert_comment($comment);
                 }
                 $dccm2wpcm[$comment_ID] = $ret_id;

trunk/wp-admin/import/livejournal.php

@@ -536 +536 @@
                 // Parse this comment into an array and insert
                 $comment = $this->parse_comment( $comment );
+                $comment = wp_filter_comment( $comment );
                 $id = wp_insert_comment( $comment );
 

trunk/wp-admin/import/textpattern.php

@@ -398 +398 @@
                 $message = $wpdb->escape($message);
 
-                if($cinfo = comment_exists($name, $posted))
-                {
+                $comment = array(
+                            'comment_post_ID'   => $comment_post_ID,
+                            'comment_author'    => $name,
+                            'comment_author_IP' => $ip,
+                            'comment_author_email'  => $email,
+                            'comment_author_url'    => $web,
+                            'comment_date'      => $posted,
+                            'comment_content'   => $message,
+                            'comment_approved'  => $comment_approved);
+                $comment = wp_filter_comment($comment);
+
+                if ( $cinfo = comment_exists($name, $posted) ) {
                     // Update comments
-                    $ret_id = wp_update_comment(array(
-                        'comment_ID'            => $cinfo,
-                        'comment_post_ID'       => $comment_post_ID,
-                        'comment_author'        => $name,
-                        'comment_author_email'  => $email,
-                        'comment_author_url'    => $web,
-                        'comment_date'          => $posted,
-                        'comment_content'       => $message,
-                        'comment_approved'      => $comment_approved)
-                        );
-                }
-                else
-                {
+                    $comment['comment_ID'] = $cinfo;
+                    $ret_id = wp_update_comment($comment);
+                } else {
                     // Insert comments
-                    $ret_id = wp_insert_comment(array(
-                        'comment_post_ID'       => $comment_post_ID,
-                        'comment_author'        => $name,
-                        'comment_author_email'  => $email,
-                        'comment_author_url'    => $web,
-                        'comment_author_IP'     => $ip,
-                        'comment_date'          => $posted,
-                        'comment_content'       => $message,
-                        'comment_approved'      => $comment_approved)
-                        );
+                    $ret_id = wp_insert_comment($comment);
                 }
                 $txpcm2wpcm[$comment_ID] = $ret_id;