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

Re-parse tax query just before calling get_tax_sql(). Fixes #15161 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16380 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-11-15 10:11:25 +00:00
parent 2b58e241d0
commit 7cb5240bd6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/query.php
View File

@ -1461,12 +1461,13 @@ class WP_Query {
} }
/* /*
* Populates the 'tax_query' property * Parses various taxonomy related query vars and sets the appropriate query flags
* *
* @access protected * @access protected
* @since 3.1.0 * @since 3.1.0
* *
* @param array &$q The query variables * @param array &$q The query variables
* @return array tax query
*/ */
function parse_tax_query( &$q ) { function parse_tax_query( &$q ) {
if ( ! empty( $q['tax_query'] ) && is_array( $q['tax_query'] ) ) { if ( ! empty( $q['tax_query'] ) && is_array( $q['tax_query'] ) ) {
@ -1580,9 +1581,7 @@ class WP_Query {
); );
} }
$q['tax_query'] = $tax_query; foreach ( $tax_query as $query ) {
foreach ( $q['tax_query'] as $query ) {
if ( 'IN' == $query['operator'] ) { if ( 'IN' == $query['operator'] ) {
switch ( $query['taxonomy'] ) { switch ( $query['taxonomy'] ) {
case 'category': case 'category':
@ -1596,6 +1595,8 @@ class WP_Query {
} }
} }
} }
return $tax_query;
} }
/** /**
@ -1930,6 +1931,7 @@ 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
$q['tax_query'] = $this->parse_tax_query( $q );
if ( !empty( $q['tax_query'] ) ) { if ( !empty( $q['tax_query'] ) ) {
if ( empty($post_type) ) { if ( empty($post_type) ) {
$post_type = 'any'; $post_type = 'any';
@ -1941,7 +1943,7 @@ class WP_Query {
$where .= get_tax_sql( $q['tax_query'], "$wpdb->posts.ID" ); $where .= get_tax_sql( $q['tax_query'], "$wpdb->posts.ID" );
// Back-compat // Back-compat
$cat_query = wp_list_filter( $q['tax_query'], array( 'taxonomy' => 'category' ) ); $cat_query = wp_list_filter( $q['tax_query'], array( 'taxonomy' => 'category', 'operator' => 'IN' ) );
if ( !empty( $cat_query ) ) { if ( !empty( $cat_query ) ) {
$cat_query = reset( $cat_query ); $cat_query = reset( $cat_query );
$cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' ); $cat = get_term_by( $cat_query['field'], $cat_query['terms'][0], 'category' );