Changeset 27067

Timestamp:

02/02/2014 07:35:54 AM (11 years ago)

Author:

wonderboymusic

Message:

Fix an error in SQL generation when perm is set and an array is passed for post_status. Adds unit test.

Props oso96_2000.
Fixes #25523.

Location:

trunk

Files:

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

trunk/src/wp-includes/query.php

@@ -2757 +2757 @@
                     $statuswheres[$index] = "($statuswhere OR ($wpdb->posts.post_status = 'inherit' AND " . str_replace($wpdb->posts, 'p2', $statuswhere) . "))";
             }
-            foreach ( $statuswheres as $statuswhere )
-                $where .= " AND $statuswhere";
+            $where_status = implode( ' OR ', $statuswheres );
+            if ( ! empty( $where_status ) ) {
+                $where .= " AND ($where_status)";
+            } 
         } elseif ( !$this->is_singular ) {
             $where .= " AND ($wpdb->posts.post_status = 'publish'";

trunk/tests/phpunit/tests/query.php

@@ -77 +77 @@
             $this->assertEquals( get_the_ID(), $post_id );
         }
-
     }
 }

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

@@ -534 +534 @@
         $this->assertFalse( $this->q->is_year );
     }
+
+    function test_perm_with_status_array() {
+        global $wpdb;
+        $this->q->query( array( 'perm' => 'readable', 'post_status' => array( 'publish', 'private' ) ) );
+        $this->assertTrue( $this->q->have_posts() );
+        $this->assertContains( "(({$wpdb->posts}.post_status = 'publish') OR ({$wpdb->posts}.post_author = 0 AND ({$wpdb->posts}.post_status = 'private')))",
+            $this->q->request
+        );
+        $this->assertNotContains( "({$wpdb->posts}.post_status = 'publish') AND", $this->q->request );
+    }
 }