From 8b107e23f4a37fa7467f93ffabd7693362c8f36c Mon Sep 17 00:00:00 2001 From: scribu Date: Tue, 16 Nov 2010 16:36:20 +0000 Subject: [PATCH] Revert [16402] outright. Causes issues with themes. See #12891 git-svn-id: http://svn.automattic.com/wordpress/trunk@16404 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/query.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/wp-includes/query.php b/wp-includes/query.php index da525f5e7f..81601aac98 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -1931,9 +1931,8 @@ class WP_Query { $search = apply_filters_ref_array('posts_search', array( $search, &$this ) ); // Taxonomies - $tax_query = $this->parse_tax_query( $q ); - - if ( !empty( $tax_query ) ) { + $q['tax_query'] = $this->parse_tax_query( $q ); + if ( !empty( $q['tax_query'] ) ) { if ( empty($post_type) ) { $post_type = 'any'; $post_status_join = true; @@ -1941,10 +1940,10 @@ class WP_Query { $post_status_join = true; } - $where .= get_tax_sql( $tax_query, "$wpdb->posts.ID" ); + $where .= get_tax_sql( $q['tax_query'], "$wpdb->posts.ID" ); // Back-compat - $tax_query_in = wp_list_filter( $tax_query, array( 'operator' => 'IN' ) ); + $tax_query_in = wp_list_filter( $q['tax_query'], array( 'operator' => 'IN' ) ); if ( !empty( $tax_query_in ) ) { if ( !isset( $q['taxonomy'] ) ) { foreach ( $tax_query_in as $a_tax_query ) {