Changeset 34131

Timestamp:

09/14/2015 10:03:23 PM (11 years ago)

Author:

wonderboymusic

Message:

The "counts" cache for comments by post id is never invalidated. Neither wp_update_comment_count() nor wp_update_comment_count_now() touch the cache.

Adds unit test.
See #33875.

Location:

trunk

Files:

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

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

@@ -1917 +1917 @@
         clean_post_cache( $post );
 
+        wp_cache_delete( "comments-{$post_id}", 'counts' );
+
         /**
          * Fires immediately after a post's comment count is updated in the database.
@@ -2325 +2327 @@
         foreach ( (array) $ids as $id ) {
                 wp_cache_delete( $id, 'comment' );
-                wp_cache_delete( "comment-{$id}", 'counts' );
         }
 

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

@@ -88 +88 @@
                 $this->assertEquals( 0, $count->total_comments );
         }
+
+        public function test_wp_count_comments_cache() {
+                $post_id = $this->factory->post->create( array(
+                        'post_status' => 'publish'
+                ) );
+                $comment_id = $this->factory->comment->create( array(
+                        'comment_approved' => '1',
+                        'comment_post_ID' => $post_id
+                ) );
+
+                $count1 = wp_count_comments( $post_id );
+
+                $this->assertEquals( 1, $count1->approved );
+                $this->assertEquals( 0, $count1->moderated );
+                $this->assertEquals( 0, $count1->spam );
+                $this->assertEquals( 0, $count1->trash );
+                $this->assertEquals( 0, $count1->{'post-trashed'} );
+                $this->assertEquals( 1, $count1->total_comments );
+
+                wp_spam_comment( $comment_id );
+                $count2 = wp_count_comments( $post_id );
+
+                $this->assertEquals( 0, $count2->approved );
+                $this->assertEquals( 0, $count2->moderated );
+                $this->assertEquals( 1, $count2->spam );
+                $this->assertEquals( 0, $count2->trash );
+                $this->assertEquals( 0, $count2->{'post-trashed'} );
+                $this->assertEquals( 1, $count2->total_comments );
+
+                wp_trash_comment( $comment_id );
+                $count3 = wp_count_comments( $post_id );
+
+                $this->assertEquals( 0, $count3->approved );
+                $this->assertEquals( 0, $count3->moderated );
+                $this->assertEquals( 0, $count3->spam );
+                $this->assertEquals( 1, $count3->trash );
+                $this->assertEquals( 0, $count3->{'post-trashed'} );
+                $this->assertEquals( 0, $count3->total_comments );
+                
+                wp_untrash_comment( $comment_id );
+                $count4 = wp_count_comments( $post_id );
+
+                $this->assertEquals( 0, $count4->approved );
+                $this->assertEquals( 0, $count4->moderated );
+                $this->assertEquals( 1, $count4->spam );
+                $this->assertEquals( 0, $count4->trash );
+                $this->assertEquals( 0, $count4->{'post-trashed'} );
+                $this->assertEquals( 1, $count4->total_comments );
+        }
 }