Changeset 34136

Timestamp:

09/14/2015 10:38:02 PM (9 years ago)

Author:

wonderboymusic

Message:

Ensure that the count cache for all is in sync with comment-{$post_id} values. These are the values most often relied-upon by the list table for comments.

Adds unit tests.

See #33875.

Location:

trunk

Files:

• src/wp-includes/comment-functions.php (modified) (1 diff)
• tests/phpunit/tests/comment/wpCountComments.php (modified) (4 diffs)

trunk/src/wp-includes/comment-functions.php

@@ -1917 +1917 @@
     clean_post_cache( $post );
 
+    wp_cache_delete( 'comments-0', 'counts' );
     wp_cache_delete( "comments-{$post_id}", 'counts' );
 

trunk/tests/phpunit/tests/comment/wpCountComments.php

@@ -107 +107 @@
         $this->assertEquals( 1, $count1->total_comments );
 
+        $all_count1 = wp_count_comments();
+
+        $this->assertEquals( 1, $all_count1->approved );
+        $this->assertEquals( 0, $all_count1->moderated );
+        $this->assertEquals( 0, $all_count1->spam );
+        $this->assertEquals( 0, $all_count1->trash );
+        $this->assertEquals( 0, $all_count1->{'post-trashed'} );
+        $this->assertEquals( 1, $all_count1->total_comments );
+
         wp_spam_comment( $comment_id );
+
         $count2 = wp_count_comments( $post_id );
 
@@ -117 +127 @@
         $this->assertEquals( 1, $count2->total_comments );
 
+        $all_count2 = wp_count_comments();
+
+        $this->assertEquals( 0, $all_count2->approved );
+        $this->assertEquals( 0, $all_count2->moderated );
+        $this->assertEquals( 1, $all_count2->spam );
+        $this->assertEquals( 0, $all_count2->trash );
+        $this->assertEquals( 0, $all_count2->{'post-trashed'} );
+        $this->assertEquals( 1, $all_count2->total_comments );
+
         wp_trash_comment( $comment_id );
+
         $count3 = wp_count_comments( $post_id );
 
@@ -126 +146 @@
         $this->assertEquals( 0, $count3->{'post-trashed'} );
         $this->assertEquals( 0, $count3->total_comments );
-        
+
+        $all_count3 = wp_count_comments();
+
+        $this->assertEquals( 0, $all_count3->approved );
+        $this->assertEquals( 0, $all_count3->moderated );
+        $this->assertEquals( 0, $all_count3->spam );
+        $this->assertEquals( 1, $all_count3->trash );
+        $this->assertEquals( 0, $all_count3->{'post-trashed'} );
+        $this->assertEquals( 0, $all_count3->total_comments );
+
         wp_untrash_comment( $comment_id );
+
         $count4 = wp_count_comments( $post_id );
 
@@ -136 +166 @@
         $this->assertEquals( 0, $count4->{'post-trashed'} );
         $this->assertEquals( 1, $count4->total_comments );
+
+        $all_count4 = wp_count_comments();
+
+        $this->assertEquals( 0, $all_count4->approved );
+        $this->assertEquals( 0, $all_count4->moderated );
+        $this->assertEquals( 1, $all_count4->spam );
+        $this->assertEquals( 0, $all_count4->trash );
+        $this->assertEquals( 0, $all_count4->{'post-trashed'} );
+        $this->assertEquals( 1, $all_count4->total_comments );
     }
 }