Changeset 34161

Timestamp:

09/15/2015 01:46:51 AM (11 years ago)

Author:

wonderboymusic

Message:

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.

Location:

trunk

Files:

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

trunk/src/wp-admin/includes/ajax-actions.php

@@ -372 +372 @@
         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'] ) ) {

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

@@ -363 +363 @@
                 'post-trashed'        => 0,
                 'total_comments'      => 0,
+                'all'                 => 0,
         );
 
@@ -380 +381 @@
                                 $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:

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

@@ -12 +12 @@
                 $this->assertEquals( 0, $count->{'post-trashed'} );
                 $this->assertEquals( 0, $count->total_comments );
+                $this->assertEquals( 0, $count->all );
         }
 
@@ -27 +28 @@
                 $this->assertEquals( 0, $count->{'post-trashed'} );
                 $this->assertEquals( 1, $count->total_comments );
+                $this->assertEquals( 1, $count->all );
         }
 
@@ -42 +44 @@
                 $this->assertEquals( 0, $count->{'post-trashed'} );
                 $this->assertEquals( 1, $count->total_comments );
+                $this->assertEquals( 1, $count->all );
         }
 
@@ -57 +60 @@
                 $this->assertEquals( 0, $count->{'post-trashed'} );
                 $this->assertEquals( 1, $count->total_comments );
+                $this->assertEquals( 0, $count->all );
         }
 
@@ -72 +76 @@
                 $this->assertEquals( 0, $count->{'post-trashed'} );
                 $this->assertEquals( 0, $count->total_comments );
+                $this->assertEquals( 0, $count->all );
         }
 
@@ -87 +92 @@
                 $this->assertEquals( 1, $count->{'post-trashed'} );
                 $this->assertEquals( 0, $count->total_comments );
+                $this->assertEquals( 0, $count->all );
         }
 
@@ -106 +112 @@
                 $this->assertEquals( 0, $count1->{'post-trashed'} );
                 $this->assertEquals( 1, $count1->total_comments );
+                $this->assertEquals( 1, $count1->all );
 
                 $all_count1 = wp_count_comments();
@@ -115 +122 @@
                 $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 );
@@ -126 +134 @@
                 $this->assertEquals( 0, $count2->{'post-trashed'} );
                 $this->assertEquals( 1, $count2->total_comments );
+                $this->assertEquals( 0, $count2->all );
 
                 $all_count2 = wp_count_comments();
@@ -135 +144 @@
                 $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 );
@@ -146 +156 @@
                 $this->assertEquals( 0, $count3->{'post-trashed'} );
                 $this->assertEquals( 0, $count3->total_comments );
+                $this->assertEquals( 0, $count3->all );
 
                 $all_count3 = wp_count_comments();
@@ -155 +166 @@
                 $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 );
@@ -166 +178 @@
                 $this->assertEquals( 0, $count4->{'post-trashed'} );
                 $this->assertEquals( 1, $count4->total_comments );
+                $this->assertEquals( 0, $count4->all );
 
                 $all_count4 = wp_count_comments();
@@ -175 +188 @@
                 $this->assertEquals( 0, $all_count4->{'post-trashed'} );
                 $this->assertEquals( 1, $all_count4->total_comments );
+                $this->assertEquals( 0, $all_count4->all );
         }
 }