sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.


git-svn-id: https://develop.svn.wordpress.org/trunk@34136 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2015-09-14 22:38:02 +00:00
parent 354000b5ca
commit 8cb6843170
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/wp-includes/comment-functions.php
View File

@ -1916,6 +1916,7 @@ function wp_update_comment_count_now($post_id) {
clean_post_cache( $post );
wp_cache_delete( 'comments-0', 'counts' );
wp_cache_delete( "comments-{$post_id}", 'counts' );
/**

39
tests/phpunit/tests/comment/wpCountComments.php
View File

@ -106,7 +106,17 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 0, $count1->{'post-trashed'} );
$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 );
$this->assertEquals( 0, $count2->approved );
@ -116,7 +126,17 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 0, $count2->{'post-trashed'} );
$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 );
$this->assertEquals( 0, $count3->approved );
@ -126,7 +146,17 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$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 );
$this->assertEquals( 0, $count4->approved );
@ -135,5 +165,14 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 0, $count4->trash );
$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 );
}
}