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

In `_wp_ajax_delete_comment_response()`, read the new `'all'` prop returned by `get_comment_count()` via `wp_count_comments()` when setting `$total`. `'all'` doesn't include `spam` in its count. 

Updates unit tests.

Props dipesh.kakadiya.
Fixes #32362.


git-svn-id: https://develop.svn.wordpress.org/trunk@34161 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2015-09-15 01:46:51 +00:00
parent 2817bb6557
commit 5c85369bb6
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wp-admin/includes/ajax-actions.php
View File

@ -371,7 +371,8 @@ function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) {
// Only do the expensive stuff on a page-break, and about 1 other time per page
if ( 0 == $total % $per_page || 1 == mt_rand( 1, $per_page ) ) {
$post_id = 0;
$status = 'total_comments'; // What type of comment count are we looking for?
// What type of comment count are we looking for?
$status = 'all';
$parsed = parse_url( $url );
if ( isset( $parsed['query'] ) ) {
parse_str( $parsed['query'], $query_vars );

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

@ -362,6 +362,7 @@ function get_comment_count( $post_id = 0 ) {
'trash' => 0,
'post-trashed' => 0,
'total_comments' => 0,
'all' => 0,
);
foreach ( $totals as $row ) {
@ -379,10 +380,12 @@ function get_comment_count( $post_id = 0 ) {
case '1':
$comment_count['approved'] = $row['total'];
$comment_count['total_comments'] += $row['total'];
$comment_count['all'] += $row['total'];
break;
case '0':
$comment_count['awaiting_moderation'] = $row['total'];
$comment_count['total_comments'] += $row['total'];
$comment_count['all'] += $row['total'];
break;
default:
break;

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

@ -11,6 +11,7 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 0, $count->trash );
$this->assertEquals( 0, $count->{'post-trashed'} );
$this->assertEquals( 0, $count->total_comments );
$this->assertEquals( 0, $count->all );
}
public function test_wp_count_comments_approved() {
@ -26,6 +27,7 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 0, $count->trash );
$this->assertEquals( 0, $count->{'post-trashed'} );
$this->assertEquals( 1, $count->total_comments );
$this->assertEquals( 1, $count->all );
}
public function test_wp_count_comments_awaiting() {
@ -41,6 +43,7 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 0, $count->trash );
$this->assertEquals( 0, $count->{'post-trashed'} );
$this->assertEquals( 1, $count->total_comments );
$this->assertEquals( 1, $count->all );
}
public function test_wp_count_comments_spam() {
@ -56,6 +59,7 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 0, $count->trash );
$this->assertEquals( 0, $count->{'post-trashed'} );
$this->assertEquals( 1, $count->total_comments );
$this->assertEquals( 0, $count->all );
}
public function test_wp_count_comments_trash() {
@ -71,6 +75,7 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 1, $count->trash );
$this->assertEquals( 0, $count->{'post-trashed'} );
$this->assertEquals( 0, $count->total_comments );
$this->assertEquals( 0, $count->all );
}
public function test_wp_count_comments_post_trashed() {
@ -86,6 +91,7 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 0, $count->trash );
$this->assertEquals( 1, $count->{'post-trashed'} );
$this->assertEquals( 0, $count->total_comments );
$this->assertEquals( 0, $count->all );
}
public function test_wp_count_comments_cache() {
@ -105,6 +111,7 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 0, $count1->trash );
$this->assertEquals( 0, $count1->{'post-trashed'} );
$this->assertEquals( 1, $count1->total_comments );
$this->assertEquals( 1, $count1->all );
$all_count1 = wp_count_comments();
@ -114,6 +121,7 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 0, $all_count1->trash );
$this->assertEquals( 0, $all_count1->{'post-trashed'} );
$this->assertEquals( 1, $all_count1->total_comments );
$this->assertEquals( 1, $all_count1->all );
wp_spam_comment( $comment_id );
@ -125,6 +133,7 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 0, $count2->trash );
$this->assertEquals( 0, $count2->{'post-trashed'} );
$this->assertEquals( 1, $count2->total_comments );
$this->assertEquals( 0, $count2->all );
$all_count2 = wp_count_comments();
@ -134,6 +143,7 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 0, $all_count2->trash );
$this->assertEquals( 0, $all_count2->{'post-trashed'} );
$this->assertEquals( 1, $all_count2->total_comments );
$this->assertEquals( 0, $all_count2->all );
wp_trash_comment( $comment_id );
@ -145,6 +155,7 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 1, $count3->trash );
$this->assertEquals( 0, $count3->{'post-trashed'} );
$this->assertEquals( 0, $count3->total_comments );
$this->assertEquals( 0, $count3->all );
$all_count3 = wp_count_comments();
@ -154,6 +165,7 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 1, $all_count3->trash );
$this->assertEquals( 0, $all_count3->{'post-trashed'} );
$this->assertEquals( 0, $all_count3->total_comments );
$this->assertEquals( 0, $all_count3->all );
wp_untrash_comment( $comment_id );
@ -165,6 +177,7 @@ 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 );
$this->assertEquals( 0, $count4->all );
$all_count4 = wp_count_comments();
@ -174,5 +187,6 @@ class Tests_WP_Count_Comments extends WP_UnitTestCase {
$this->assertEquals( 0, $all_count4->trash );
$this->assertEquals( 0, $all_count4->{'post-trashed'} );
$this->assertEquals( 1, $all_count4->total_comments );
$this->assertEquals( 0, $all_count4->all );
}
}