Changeset 30026

Timestamp:

10/26/14 16:45:37 (4 days ago)

Author:

boonebgorges

Message:

Fix 'count' in WP_Comment_Query when using 'meta_query'.

Props heshiming, desaiuditd.
Fixes #23369.

Location:

trunk

Files:

• src/wp-includes/comment.php (modified) (1 diff)
• tests/phpunit/tests/comment/query.php (modified) (1 diff)

trunk/src/wp-includes/comment.php

@@ -560 +560 @@
             $join .= $clauses['join'];
             $where .= $clauses['where'];
-            $groupby = "{$wpdb->comments}.comment_ID";
+
+            if ( ! $this->query_vars['count'] ) {
+                $groupby = "{$wpdb->comments}.comment_ID";
+            }
         }
 

trunk/tests/phpunit/tests/comment/query.php

@@ -614 +614 @@
         $this->assertNotContains( 'ORDER BY', $q->request );
     }
+
+    public function test_count() {
+        $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
+        $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
+
+        $q = new WP_Comment_Query();
+        $found = $q->query( array(
+            'count' => true,
+        ) );
+
+        $this->assertEquals( 2, $found );
+    }
+
+    /**
+     * @ticket 23369
+     */
+    public function test_count_with_meta_query() {
+        $c1 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
+        $c2 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
+        $c3 = $this->factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
+        add_comment_meta( $c1, 'foo', 'bar' );
+        add_comment_meta( $c3, 'foo', 'bar' );
+
+        $q = new WP_Comment_Query();
+        $found = $q->query( array(
+            'count' => true,
+            'meta_query' => array(
+                array(
+                    'key' => 'foo',
+                    'value' => 'bar',
+                ),
+            ),
+        ) );
+
+        $this->assertEquals( 2, $found );
+    }
 }