Changeset 33822

Timestamp:

08/31/2015 06:50:12 PM (9 years ago)

Author:

wonderboymusic

Message:

Comments: wp_count_comments() can use get_comment_count() internally to makes its DB query, provided that get_comment_count() returns more properties.

Adds/updates unit tests. There were zero (0) unit tests for wp_count_comments().

Fixes #19903.

Location:

trunk

Files:

• src/wp-includes/comment-functions.php (modified) (3 diffs)
• tests/phpunit/tests/comment/getCommentCount.php (modified) (5 diffs)

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

@@ -364 +364 @@
 
     $comment_count = array(
-        "approved"              => 0,
-        "awaiting_moderation"   => 0,
-        "spam"                  => 0,
-        "total_comments"        => 0
+        'approved'            => 0,
+        'awaiting_moderation' => 0,
+        'spam'                => 0,
+        'trash'               => 0,
+        'post-trashed'        => 0,
+        'total_comments'      => 0,
     );
 
     foreach ( $totals as $row ) {
         switch ( $row['comment_approved'] ) {
+            case 'trash':
+                $comment_count['trash'] = $row['total'];
+                break;
+            case 'post-trashed':
+                $comment_count['post-trashed'] = $row['total'];
+                break;
             case 'spam':
                 $comment_count['spam'] = $row['total'];
-                $comment_count["total_comments"] += $row['total'];
+                $comment_count['total_comments'] += $row['total'];
                 break;
             case '1':
@@ -922 +930 @@
  * @since 2.5.0
  *
- * @global wpdb $wpdb
- *
  * @param int $post_id Optional. Post ID.
  * @return object|array Comment stats.
  */
 function wp_count_comments( $post_id = 0 ) {
-    global $wpdb;
-
     $post_id = (int) $post_id;
 
@@ -940 +944 @@
      * @param int   $post_id The post ID.
      */
-    $stats = apply_filters( 'wp_count_comments', array(), $post_id );
-    if ( !empty($stats) )
-        return $stats;
-
-    $count = wp_cache_get("comments-{$post_id}", 'counts');
-
-    if ( false !== $count )
+    $filtered = apply_filters( 'wp_count_comments', array(), $post_id );
+    if ( ! empty( $filtered ) ) {
+        return $filtered;
+    }
+
+    $count = wp_cache_get( "comments-{$post_id}", 'counts' );
+    if ( false !== $count ) {
         return $count;
-
-    $where = '';
-    if ( $post_id > 0 )
-        $where = $wpdb->prepare( "WHERE comment_post_ID = %d", $post_id );
-
-    $count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A );
-
-    $total = 0;
-    $approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
-    foreach ( (array) $count as $row ) {
-        // Don't count post-trashed toward totals
-        if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
-            $total += $row['num_comments'];
-        if ( isset( $approved[$row['comment_approved']] ) )
-            $stats[$approved[$row['comment_approved']]] = $row['num_comments'];
-    }
-
-    $stats['total_comments'] = $total;
-    foreach ( $approved as $key ) {
-        if ( empty($stats[$key]) )
-            $stats[$key] = 0;
-    }
-
-    $stats = (object) $stats;
-    wp_cache_set("comments-{$post_id}", $stats, 'counts');
-
-    return $stats;
+    }
+
+    $stats = get_comment_count( $post_id );
+    $stats['moderated'] = $stats['awaiting_moderation'];
+    unset( $stats['awaiting_moderation'] );
+
+    $stats_object = (object) $stats;
+    wp_cache_set( "comments-{$post_id}", $stats_object, 'counts' );
+
+    return $stats_object;
 }
 

trunk/tests/phpunit/tests/comment/getCommentCount.php

@@ -9 +9 @@
         $this->assertEquals( 0, $count['awaiting_moderation'] );
         $this->assertEquals( 0, $count['spam'] );
+        $this->assertEquals( 0, $count['trash'] );
+        $this->assertEquals( 0, $count['post-trashed'] );
         $this->assertEquals( 0, $count['total_comments'] );
     }
@@ -22 +24 @@
         $this->assertEquals( 0, $count['awaiting_moderation'] );
         $this->assertEquals( 0, $count['spam'] );
+        $this->assertEquals( 0, $count['trash'] );
+        $this->assertEquals( 0, $count['post-trashed'] );
         $this->assertEquals( 1, $count['total_comments'] );
     }
@@ -35 +39 @@
         $this->assertEquals( 1, $count['awaiting_moderation'] );
         $this->assertEquals( 0, $count['spam'] );
+        $this->assertEquals( 0, $count['trash'] );
+        $this->assertEquals( 0, $count['post-trashed'] );
         $this->assertEquals( 1, $count['total_comments'] );
     }
@@ -48 +54 @@
         $this->assertEquals( 0, $count['awaiting_moderation'] );
         $this->assertEquals( 1, $count['spam'] );
+        $this->assertEquals( 0, $count['trash'] );
+        $this->assertEquals( 0, $count['post-trashed'] );
         $this->assertEquals( 1, $count['total_comments'] );
     }
@@ -61 +69 @@
         $this->assertEquals( 0, $count['awaiting_moderation'] );
         $this->assertEquals( 0, $count['spam'] );
+        $this->assertEquals( 1, $count['trash'] );
+        $this->assertEquals( 0, $count['post-trashed'] );
+        $this->assertEquals( 0, $count['total_comments'] );
+    }
+
+    public function test_get_comment_count_post_trashed() {
+        $this->factory->comment->create( array(
+            'comment_approved' => 'post-trashed'
+        ) );
+
+        $count = get_comment_count();
+
+        $this->assertEquals( 0, $count['approved'] );
+        $this->assertEquals( 0, $count['awaiting_moderation'] );
+        $this->assertEquals( 0, $count['spam'] );
+        $this->assertEquals( 0, $count['trash'] );
+        $this->assertEquals( 1, $count['post-trashed'] );
         $this->assertEquals( 0, $count['total_comments'] );
     }