Changeset 36326

Timestamp:

01/15/2016 08:09:36 PM (9 years ago)

Author:

boonebgorges

Message:

Respect all post-related filters in WP_Comment_Query.

The refactor of WP_Comment_Query's SQL generation in [34542] introduced a bug
that caused only the last post-related filter to be respected in comment
queries. In other words, if querying for comments using params
post_status=draft&post_author=3, only the last-processed of these params
would be respected. The current changeset fixes the logic so that these clauses
don't overwrite each other.

Props chriscct7.
Fixes #35478.

Location:

trunk

Files:

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

trunk/src/wp-includes/class-wp-comment-query.php

@@ -766 +766 @@
                 // $field_value may be an array.
                 $esses = array_fill( 0, count( (array) $field_value ), '%s' );
-                $this->sql_clauses['where']['post_fields'] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
+                $this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
             }
         }

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

@@ -533 +533 @@
 
         $this->assertEqualSets( array( $c1, $c2 ), $found );
+    }
+
+    /**
+     * @ticket 35478
+     */
+    public function test_multiple_post_fields_should_all_be_respected() {
+        $posts = array();
+
+        $posts[] = self::factory()->post->create( array(
+            'post_status' => 'publish',
+            'post_author' => 3,
+        ) );
+
+        $posts[] = self::factory()->post->create( array(
+            'post_status' => 'draft',
+            'post_author' => 4,
+        ) );
+
+        $posts[] = self::factory()->post->create( array(
+            'post_status' => 'draft',
+            'post_author' => 3,
+        ) );
+
+        $comments = array();
+        foreach ( $posts as $post ) {
+            $comments[] = self::factory()->comment->create( array(
+                'comment_post_ID' => $post,
+            ) );
+        }
+
+        $q = new WP_Comment_Query( array(
+            'post_status' => 'draft',
+            'post_author' => 3,
+            'fields' => 'ids',
+        ) );
+
+        $this->assertSame( array( $comments[2] ), $q->comments );
     }