Changeset 28783

Timestamp:

06/20/2014 04:20:35 PM (12 years ago)

Author:

wonderboymusic

Message:

Revert [28613] and [28664]. A good idea, but too much BC baggage.

See #28099.

Location:

trunk

Files:

• src/wp-includes/query.php (modified) (7 diffs)
• tests/phpunit/tests/query/results.php (modified) (2 diffs)
• tests/phpunit/tests/term/query.php (modified) (3 diffs)

trunk/src/wp-includes/query.php

@@ -1831 +1831 @@
                                 'include_children' => false
                         );
-                } elseif ( isset( $this->query['category__in'] ) ) {
-                        $q['category__in'] = false;
                 }
 
@@ -1890 +1888 @@
                                 'terms' => $q['tag__in']
                         );
-                } elseif ( isset( $this->query['tag__in'] ) ) {
-                        $q['tag__in'] = false;
                 }
 
@@ -1919 +1915 @@
                                 'field' => 'slug'
                         );
-                } elseif ( isset( $this->query['tag_slug__in'] ) ) {
-                        $q['tag_slug__in'] = false;
                 }
 
@@ -2454 +2448 @@
                         $post__in = implode(',', array_map( 'absint', $q['post__in'] ));
                         $where .= " AND {$wpdb->posts}.ID IN ($post__in)";
-                } elseif ( isset( $this->query['post__in'] ) ) {
-                        $post__in = 0;
-                        $where .= " AND 1=0 ";
                 } elseif ( $q['post__not_in'] ) {
                         $post__not_in = implode(',',  array_map( 'absint', $q['post__not_in'] ));
@@ -2467 +2458 @@
                         $post_parent__in = implode( ',', array_map( 'absint', $q['post_parent__in'] ) );
                         $where .= " AND {$wpdb->posts}.post_parent IN ($post_parent__in)";
-                } elseif ( isset( $this->query['post_parent__in'] ) ) {
-                        $post_parent__in = 0;
-                        $where .= " AND 1=0 ";
                 } elseif ( $q['post_parent__not_in'] ) {
                         $post_parent__not_in = implode( ',',  array_map( 'absint', $q['post_parent__not_in'] ) );
@@ -2507 +2495 @@
                         $join .= $clauses['join'];
                         $where .= $clauses['where'];
-                }
-
-                // 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";
-                        }
                 }
 
@@ -2607 +2588 @@
                         $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

@@ -403 +403 @@
         }
 
+        /**
+         * @ticket 28099
+         */
         function test_empty_post__in() {
                 $posts1 = $this->q->query( array() );
                 $this->assertNotEmpty( $posts1 );
                 $posts2 = $this->q->query( array( 'post__in' => array() ) );
-                $this->assertEmpty( $posts2 );
+                $this->assertNotEmpty( $posts2 );
                 $posts3 = $this->q->query( array( 'post_parent__in' => array() ) );
-                $this->assertEmpty( $posts3 );
+                $this->assertNotEmpty( $posts3 );
         }
 
@@ -515 +518 @@
 
                 $posts = $this->q->query( array( 'author__in' => array() ) );
-                $this->assertEmpty( $posts );
+                $this->assertNotEmpty( $posts );
 
                 $posts = $this->q->query( array(

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

@@ -204 +204 @@
         }
 
+        /**
+         * @ticket 28099
+         */
         function test_empty__in() {
                 $cat_id = $this->factory->category->create();
@@ -212 +215 @@
                 $this->assertNotEmpty( $q1 );
                 $q2 = get_posts( array( 'category__in' => array() ) );
-                $this->assertEmpty( $q2 );
+                $this->assertNotEmpty( $q2 );
 
                 $tag = wp_insert_term( 'woo', 'post_tag' );
@@ -222 +225 @@
                 $this->assertNotEmpty( $q3 );
                 $q4 = get_posts( array( 'tag__in' => array() ) );
-                $this->assertEmpty( $q4 );
+                $this->assertNotEmpty( $q4 );
 
                 $q5 = get_posts( array( 'tag_slug__in' => array( $slug ) ) );
                 $this->assertNotEmpty( $q5 );
                 $q6 = get_posts( array( 'tag_slug__in' => array() ) );
-                $this->assertEmpty( $q6 );
+                $this->assertNotEmpty( $q6 );
         }
 }