Changeset 32461

Timestamp:

05/08/2015 07:44:06 PM (9 years ago)

Author:

boonebgorges

Message:

Use table prefix for comment__in and comment__not_in SQL clauses of WP_Comment_Query.

The prefix prevents ambiguity when joining against other tables.

Props willgladstone.
Fixes #32081.

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

@@ -697 +697 @@
         // Parse comment IDs for an IN clause.
         if ( ! empty( $this->query_vars['comment__in'] ) ) {
-            $where[] = 'comment_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
+            $where[] = "$wpdb->comments.comment_ID IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
         }
 
         // Parse comment IDs for a NOT IN clause.
         if ( ! empty( $this->query_vars['comment__not_in'] ) ) {
-            $where[] = 'comment_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
+            $where[] = "$wpdb->comments.comment_ID NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
         }
 

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

@@ -723 +723 @@
     }
 
+    /**
+     * @group 32081
+     */
+    public function test_meta_query_should_work_with_comment__in() {
+        $comments = $this->factory->comment->create_many( 3 );
+
+        add_comment_meta( $comments[0], 'foo', 'jjj' );
+        add_comment_meta( $comments[1], 'foo', 'zzz' );
+        add_comment_meta( $comments[2], 'foo', 'jjj' );
+
+        $q = new WP_Comment_Query( array(
+            'comment__in' => array( $comments[1], $comments[2] ),
+            'meta_query' => array(
+                array(
+                    'key' => 'foo',
+                    'value' => 'jjj',
+                ),
+            ),
+            'fields' => 'ids',
+        ) );
+
+        $this->assertEquals( array( $comments[2] ), $q->get_comments() );
+    }
+
+    /**
+     * @group 32081
+     */
+    public function test_meta_query_should_work_with_comment__not_in() {
+        $comments = $this->factory->comment->create_many( 3 );
+
+        add_comment_meta( $comments[0], 'foo', 'jjj' );
+        add_comment_meta( $comments[1], 'foo', 'zzz' );
+        add_comment_meta( $comments[2], 'foo', 'jjj' );
+
+        $q = new WP_Comment_Query( array(
+            'comment__not_in' => array( $comments[1], $comments[2] ),
+            'meta_query' => array(
+                array(
+                    'key' => 'foo',
+                    'value' => 'jjj',
+                ),
+            ),
+            'fields' => 'ids',
+        ) );
+
+        $this->assertEquals( array( $comments[0] ), $q->get_comments() );
+    }
 
     /**