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

Don't pollute the 'tax_query' query var. See #12891 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16402 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-11-16 16:22:09 +00:00
parent 99f3141859
commit 690cd434d1
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/query.php
View File

@ -1931,8 +1931,9 @@ class WP_Query {
$search = apply_filters_ref_array('posts_search', array( $search, &$this ) );
// Taxonomies
$q['tax_query'] = $this->parse_tax_query( $q );
if ( !empty( $q['tax_query'] ) ) {
$tax_query = $this->parse_tax_query( $q );
if ( !empty( $tax_query ) ) {
if ( empty($post_type) ) {
$post_type = 'any';
$post_status_join = true;
@ -1940,10 +1941,10 @@ class WP_Query {
$post_status_join = true;
}
$where .= get_tax_sql( $q['tax_query'], "$wpdb->posts.ID" );
$where .= get_tax_sql( $tax_query, "$wpdb->posts.ID" );
// Back-compat
$tax_query_in = wp_list_filter( $q['tax_query'], array( 'operator' => 'IN' ) );
$tax_query_in = wp_list_filter( $tax_query, array( 'operator' => 'IN' ) );
if ( !empty( $tax_query_in ) ) {
if ( !isset( $q['taxonomy'] ) ) {
foreach ( $tax_query_in as $a_tax_query ) {

6
wp-includes/taxonomy.php
View File

@ -593,17 +593,15 @@ function get_tax_sql( $tax_query, $object_id_column ) {
}
if ( 1 == count( $sql ) ) {
$ids = $wpdb->get_col( $sql[0] );
$r = $wpdb->get_col( $sql[0] );
} else {
$r = "SELECT object_id FROM $wpdb->term_relationships WHERE 1=1";
foreach ( $sql as $query )
$r .= " AND object_id IN ($query)";
$ids = $wpdb->get_col( $r );
}
if ( !empty( $ids ) )
return " AND $object_id_column IN(" . implode( ', ', $ids ) . ")";
return " AND $object_id_column IN($r)";
else
return ' AND 0 = 1';
}