Changeset 16886

Timestamp:

12/12/2010 04:38:51 PM (14 years ago)

Author:

scribu

Message:

Set $wp_query->tax_query earlier. See #15752

File:

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

trunk/wp-includes/query.php

@@ -1356 +1356 @@
             }
 
-            $tax_query_obj = $this->parse_tax_query( $qv );
-
-            foreach ( $tax_query_obj->queries as $tax_query ) {
+            $this->parse_tax_query( $qv );
+            foreach ( $this->tax_query->queries as $tax_query ) {
                 if ( 'IN' == $tax_query['operator'] ) {
                     switch ( $tax_query['taxonomy'] ) {
@@ -1372 +1371 @@
                 }
             }
-
-            unset( $tax_query_obj, $tax_query );
+            unset( $tax_query );
 
             _parse_meta_query( $qv );
@@ -1495 +1493 @@
      *
      * @param array &$q The query variables
-     * @return WP_Tax_Query
      */
     function parse_tax_query( &$q ) {
@@ -1602 +1599 @@
         }
 
-        return new WP_Tax_Query( $tax_query );
+        $this->tax_query = new WP_Tax_Query( $tax_query );
     }
 
@@ -1937 +1934 @@
 
         // Taxonomies
-        $this->tax_query = $this->parse_tax_query( $q );
+        $this->parse_tax_query( $q );
 
         if ( $this->is_category || $this->is_tag || $this->is_tax ) {