From 94dfc448b0e5138ec3732da7983525879a0789cb Mon Sep 17 00:00:00 2001 From: ryan Date: Fri, 28 Oct 2011 20:03:26 +0000 Subject: [PATCH] Compute in_search_post_types only when needed. Props mitchoyoshitaka. fixes #18364 git-svn-id: http://svn.automattic.com/wordpress/trunk@19078 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/query.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/wp-includes/query.php b/wp-includes/query.php index c94af44e1..f5f8e83f3 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -2385,13 +2385,11 @@ class WP_Query { $post_type_cap = $post_type; } - $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 ( 'any' == $post_type ) { - $where .= $exclude_post_types; + $exclude_post_types = ''; + $in_search_post_types = get_post_types( array('exclude_from_search' => false) ); + if ( ! empty( $in_search_post_types ) ) + $where .= $wpdb->prepare(" AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')"); } elseif ( !empty( $post_type ) && is_array( $post_type ) ) { $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')"; } elseif ( ! empty( $post_type ) ) {