Changeset 28664

Timestamp:

06/04/2014 05:49:26 PM (12 years ago)

Author:

wonderboymusic

Message:

After [28613], also kill queries that explicityly pass empty arrays to category__in, tag__in, tag_slug__in, and author__in to WP_Query.

Adds unit tests.
Fixes #28099.

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (5 diffs)
• tests/phpunit/tests/query/results.php (modified) (1 diff)
• tests/phpunit/tests/term/query.php (modified) (1 diff)

trunk/src/wp-includes/query.php

@@ -1831 +1831 @@
                                 'include_children' => false
                         );
+                } elseif ( isset( $this->query['category__in'] ) ) {
+                        $q['category__in'] = false;
                 }
 
@@ -1888 +1890 @@
                                 'terms' => $q['tag__in']
                         );
+                } elseif ( isset( $this->query['tag__in'] ) ) {
+                        $q['tag__in'] = false;
                 }
 
@@ -1915 +1919 @@
                                 'field' => 'slug'
                         );
+                } elseif ( isset( $this->query['tag_slug__in'] ) ) {
+                        $q['tag_slug__in'] = false;
                 }
 
@@ -2501 +2507 @@
                 }
 
+                // If *__in is passed to WP_Query as an empty array, don't return results
+                foreach ( array( 'category', 'tag', 'tag_slug' ) as $in ) {
+                        if ( isset( $q["{$in}__in"] ) && false === $q["{$in}__in"] ) {
+                                $where = " AND 1=0 $where";
+                        }
+                }
+
                 if ( $this->is_tax ) {
                         if ( empty($post_type) ) {
@@ -2592 +2605 @@
                         $author__in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__in'] ) ) );
                         $where .= " AND {$wpdb->posts}.post_author IN ($author__in) ";
+                } elseif ( isset( $this->query['author__in'] ) ) {
+                        $author__in = 0;
+                        $where .= ' AND 1=0 ';
                 }
 

trunk/tests/phpunit/tests/query/results.php

@@ -514 +514 @@
                 $this->assertEqualSets( array( $author_1, $author_2 ), $author_ids );
 
+                $posts = $this->q->query( array( 'author__in' => array() ) );
+                $this->assertEmpty( $posts );
+
                 $posts = $this->q->query( array(
                         'author__not_in' => array( $author_1, $author_2 ),

trunk/tests/phpunit/tests/term/query.php

@@ -203 +203 @@
                 $this->assertEquals( array( $posts[0], $posts[3] ), $results2, 'Relation: AND; Operator: IN' );
         }
+
+        function test_empty__in() {
+                $cat_id = $this->factory->category->create();
+                $post_id = $this->factory->post->create();
+                wp_set_post_categories( $post_id, $cat_id );
+
+                $q1 = get_posts( array( 'category__in' => array( $cat_id ) ) );
+                $this->assertNotEmpty( $q1 );
+                $q2 = get_posts( array( 'category__in' => array() ) );
+                $this->assertEmpty( $q2 );
+
+                $tag = wp_insert_term( 'woo', 'post_tag' );
+                $tag_id = $tag['term_id'];
+                $slug = get_tag( $tag_id )->slug;
+                wp_set_post_tags( $post_id, $slug );
+
+                $q3 = get_posts( array( 'tag__in' => array( $tag_id ) ) );
+                $this->assertNotEmpty( $q3 );
+                $q4 = get_posts( array( 'tag__in' => array() ) );
+                $this->assertEmpty( $q4 );
+
+                $q5 = get_posts( array( 'tag_slug__in' => array( $slug ) ) );
+                $this->assertNotEmpty( $q5 );
+                $q6 = get_posts( array( 'tag_slug__in' => array() ) );
+                $this->assertEmpty( $q6 );
+        }
 }