Changeset 16380

Timestamp:

11/15/2010 10:11:25 AM (14 years ago)

Author:

scribu

Message:

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

File:

• trunk/wp-includes/query.php (modified) (6 diffs)

trunk/wp-includes/query.php

@@ -1462 +1462 @@
 
     /*
-     * Populates the 'tax_query' property
+     * Parses various taxonomy related query vars and sets the appropriate query flags
      *
      * @access protected
@@ -1468 +1468 @@
      *
      * @param array &$q The query variables
+     * @return array tax query
      */
     function parse_tax_query( &$q ) {
@@ -1581 +1582 @@
         }
 
-        $q['tax_query'] = $tax_query;
-
-        foreach ( $q['tax_query'] as $query ) {
+        foreach ( $tax_query as $query ) {
             if ( 'IN' == $query['operator'] ) {
                 switch ( $query['taxonomy'] ) {
@@ -1597 +1596 @@
             }
         }
+
+        return $tax_query;
     }
 
@@ -1931 +1932 @@
 
         // Taxonomies
+        $q['tax_query'] = $this->parse_tax_query( $q );
         if ( !empty( $q['tax_query'] ) ) {
             if ( empty($post_type) ) {
@@ -1942 +1944 @@
 
             // 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 ) ) {
                 $cat_query = reset( $cat_query );