WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert [16402] outright. Causes issues with themes. See #12891 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16404 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-11-16 16:36:20 +00:00
parent af6dbfde54
commit 8b107e23f4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/query.php
View File

@ -1931,9 +1931,8 @@ class WP_Query {
$search = apply_filters_ref_array('posts_search', array( $search, &$this ) ); $search = apply_filters_ref_array('posts_search', array( $search, &$this ) );
// Taxonomies // Taxonomies
$tax_query = $this->parse_tax_query( $q ); $q['tax_query'] = $this->parse_tax_query( $q );
if ( !empty( $q['tax_query'] ) ) {
if ( !empty( $tax_query ) ) {
if ( empty($post_type) ) { if ( empty($post_type) ) {
$post_type = 'any'; $post_type = 'any';
$post_status_join = true; $post_status_join = true;
@ -1941,10 +1940,10 @@ class WP_Query {
$post_status_join = true; $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 // 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 ( !empty( $tax_query_in ) ) {
if ( !isset( $q['taxonomy'] ) ) { if ( !isset( $q['taxonomy'] ) ) {
foreach ( $tax_query_in as $a_tax_query ) { foreach ( $tax_query_in as $a_tax_query ) {