Filter imported comments
git-svn-id: http://svn.automattic.com/wordpress/trunk@12270 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
55c131eb14
commit
5c5b0ddaff
|
@ -622,6 +622,7 @@ class Blogger_Import {
|
|||
} else {
|
||||
$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);
|
||||
|
||||
$this->blogs[$importing_blog]['comments'][$entry->old_permalink] = $comment_id;
|
||||
|
|
|
@ -413,36 +413,25 @@ class Dotclear_Import {
|
|||
$web = "http://".$wpdb->escape($comment_site);
|
||||
$message = $wpdb->escape(textconv ($comment_content));
|
||||
|
||||
if($cinfo = comment_exists($name, $comment_dt))
|
||||
{
|
||||
$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);
|
||||
$comment = wp_filter_comment($comment);
|
||||
|
||||
if ( $cinfo = comment_exists($name, $comment_dt) ) {
|
||||
// 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_author_IP' => $comment_ip,
|
||||
'comment_date' => $comment_dt,
|
||||
'comment_date_gmt' => $comment_dt,
|
||||
'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' => $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;
|
||||
}
|
||||
|
|
|
@ -535,6 +535,7 @@ class LJ_API_Import {
|
|||
|
||||
// Parse this comment into an array and insert
|
||||
$comment = $this->parse_comment( $comment );
|
||||
$comment = wp_filter_comment( $comment );
|
||||
$id = wp_insert_comment( $comment );
|
||||
|
||||
// Clear cache
|
||||
|
|
|
@ -397,33 +397,24 @@ class Textpattern_Import {
|
|||
$web = $wpdb->escape($web);
|
||||
$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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue