Ticket #17592: 17592.diff

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 ( $this->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;
                 } elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
@@ -2417 +2420 @@
                         $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 ( $this->is_search() ) {
+                                        foreach ( get_post_stati( array('exclude_from_search' => true) ) as $status )
+                                                $e_status[] = "$wpdb->posts.post_status <> '$status'";
+                                }
                         } else {
                                 foreach ( get_post_stati() as $status ) {
                                         if ( in_array( $status, $q_status ) ) {