Changeset 28622

Timestamp:

05/29/2014 08:41:53 PM (10 years ago)

Author:

wonderboymusic

Message:

If post_status is passed to WP_Query as an array containing 'any' and anything else, don't exclude the other values if they match when running any's exclusion logic.

Adds unit tests.

Fixes #28007.

Location:

trunk

Files:

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

trunk/src/wp-includes/query.php

@@ -2768 +2768 @@
             $p_status = array();
             $e_status = array();
-            if ( in_array('any', $q_status) ) {
-                foreach ( get_post_stati( array('exclude_from_search' => true) ) as $status )
-                    $e_status[] = "$wpdb->posts.post_status <> '$status'";
+            if ( in_array( 'any', $q_status ) ) {
+                foreach ( get_post_stati( array( 'exclude_from_search' => true ) ) as $status ) {
+                    if ( ! in_array( $status, $q_status ) ) {
+                        $e_status[] = "$wpdb->posts.post_status <> '$status'";
+                    }
+                }
             } else {
                 foreach ( get_post_stati() as $status ) {

trunk/tests/phpunit/tests/post/query.php

@@ -742 +742 @@
         $this->assertEqualSets( $ordered, wp_list_pluck( $attached->posts, 'ID' ) );
     }
+
+    function test_post_status() {
+        $statuses1 = get_post_stati();
+        $this->assertContains( 'auto-draft', $statuses1 );
+
+        $statuses2 = get_post_stati( array( 'exclude_from_search' => true ) );
+        $this->assertContains( 'auto-draft', $statuses2 );
+
+        $statuses3 = get_post_stati( array( 'exclude_from_search' => false ) );
+        $this->assertNotContains( 'auto-draft', $statuses3 );
+
+        $q1 = new WP_Query( array( 'post_status' => 'any' ) );
+        $this->assertContains( "post_status <> 'auto-draft'", $q1->request );
+
+        $q2 = new WP_Query( array( 'post_status' => 'any, auto-draft' ) );
+        $this->assertNotContains( "post_status <> 'auto-draft'", $q2->request );
+
+        $q3 = new WP_Query( array( 'post_status' => array( 'any', 'auto-draft' ) ) );
+        $this->assertNotContains( "post_status <> 'auto-draft'", $q3->request );
+    }
 }