Delete the trash metadata when untrashing a comment. See #4529 props caesarsgrunt.

git-svn-id: http://svn.automattic.com/wordpress/trunk@11992 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2009-10-01 19:59:35 +00:00 · 2009-10-01 19:59:35 +00:00 · 606b6197b5
parent 966af43a1d
commit 606b6197b5
1 changed files with 4 additions and 1 deletions
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@ -890,8 +890,11 @@ function wp_untrash_comment($comment_id = 0) {
 	//Either set comment_approved to the value in comment_meta or worse case to false which will mean moderation
 	$comment['comment_approved'] = get_comment_meta($comment_id, '_wp_trash_meta_status', true);

+	delete_comment_meta($comment_id, '_wp_trash_meta_time'); 
+	delete_comment_meta($comment_id, '_wp_trash_meta_status'); 
+	
 	wp_update_comment($comment);
-
+		
 	do_action('untrashed_comment', $comment_id);

 	return true;