Changeset 33654

Timestamp:

08/20/2015 02:44:39 AM (9 years ago)

Author:

wonderboymusic

Message:

Comments shouldn't have more than one _wp_trash_meta_status entry. When deleting _wp_trash_meta_status, also delete _wp_trash_meta_time.

See #11200.

File:

• trunk/src/wp-includes/comment.php (modified) (3 diffs)

trunk/src/wp-includes/comment.php

@@ -1858 +1858 @@
 
     if ( wp_set_comment_status($comment_id, 'trash') ) {
-        add_comment_meta($comment_id, '_wp_trash_meta_status', $comment->comment_approved);
-        add_comment_meta($comment_id, '_wp_trash_meta_time', time() );
+        delete_comment_meta( $comment_id, '_wp_trash_meta_status' );
+        delete_comment_meta( $comment_id, '_wp_trash_meta_time' );
+        add_comment_meta( $comment_id, '_wp_trash_meta_status', $comment->comment_approved );
+        add_comment_meta( $comment_id, '_wp_trash_meta_time', time() );
 
         /**
@@ -1939 +1941 @@
 
     if ( wp_set_comment_status($comment_id, 'spam') ) {
-        add_comment_meta($comment_id, '_wp_trash_meta_status', $comment->comment_approved);
+        delete_comment_meta( $comment_id, '_wp_trash_meta_status' );
+        delete_comment_meta( $comment_id, '_wp_trash_meta_time' );
+        add_comment_meta( $comment_id, '_wp_trash_meta_status', $comment->comment_approved );
+        add_comment_meta( $comment_id, '_wp_trash_meta_time', time() );
         /**
          * Fires immediately after a comment is marked as Spam.
@@ -1980 +1985 @@
 
     if ( wp_set_comment_status($comment_id, $status) ) {
-        delete_comment_meta($comment_id, '_wp_trash_meta_status');
+        delete_comment_meta( $comment_id, '_wp_trash_meta_status' );
+        delete_comment_meta( $comment_id, '_wp_trash_meta_time' );
         /**
          * Fires immediately after a comment is unmarked as Spam.