Changeset 25239

Timestamp:

09/04/2013 06:50:04 PM (12 years ago)

Author:

wonderboymusic

Message:

Kill the query in the following edge case: post_type => 'any' but exclude_from_search => false returns no valid post types. Adds unit tests.

Props mitchoyoshitaka.
Fixes #19198.

Location:

trunk

Files:

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

trunk/src/wp-includes/query.php

@@ -2456 +2456 @@
         if ( 'any' == $post_type ) {
             $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
-            if ( ! empty( $in_search_post_types ) )
+            if ( empty( $in_search_post_types ) )
+                $where .= ' AND 1=0 ';
+            else    
                 $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')";
         } elseif ( !empty( $post_type ) && is_array( $post_type ) ) {

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

@@ -370 +370 @@
         ), wp_list_pluck( $posts, 'post_title' ) );
     }
+
+    function test_exlude_from_search_empty() {
+        global $wp_post_types;
+        foreach ( array_keys( $wp_post_types ) as $slug )
+            $wp_post_types[$slug]->exclude_from_search = true;
+
+        $posts = $this->q->query( array( 'post_type' => 'any' ) );
+
+        $this->assertEmpty( $posts );
+        $this->assertRegExp( '#AND 1=0#', $this->q->request );
+
+        foreach ( array_keys( $wp_post_types ) as $slug )
+            $wp_post_types[$slug]->exclude_from_search = false;
+
+        $posts2 = $this->q->query( array( 'post_type' => 'any' ) );
+
+        $this->assertNotEmpty( $posts2 );
+        $this->assertNotRegExp( '#AND 1=0#', $this->q->request );
+    }
 }