Ticket #17592: 17592.patch

wp-includes/query.php

@@ -2374 +2374 @@
                 }
 
                 $exclude_post_types = '';
-                $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
-                if ( ! empty( $in_search_post_types ) )
-                        $exclude_post_types .= $wpdb->prepare(" AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')");
+                if ( is_search() ) {
+                        $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
+                        if ( ! empty( $in_search_post_types ) )
+                                $exclude_post_types .= $wpdb->prepare(" AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')");
+                }
 
                 if ( 'any' == $post_type ) {
                         $where .= $exclude_post_types;
@@ -2416 +2418 @@
                         $r_status = array();
                         $p_status = array();
                         $e_status = array();
-                        if ( in_array('any', $q_status) ) {
+                        if ( in_array('any', $q_status) && ! is_search() ) {
                                 foreach ( get_post_stati( array('exclude_from_search' => true) ) as $status )
                                         $e_status[] = "$wpdb->posts.post_status <> '$status'";
                         } else {