Changeset 16880

Timestamp:

12/11/2010 03:20:52 PM (14 years ago)

Author:

scribu

Message:

Don't set query flags in parse_tax_query(). See #15487

File:

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

trunk/wp-includes/query.php

@@ -1356 +1356 @@
             }
 
-            $this->parse_tax_query( $qv );
+            $tax_query_obj = $this->parse_tax_query( $qv );
+
+            foreach ( $tax_query_obj->queries as $tax_query ) {
+                if ( 'IN' == $tax_query['operator'] ) {
+                    switch ( $tax_query['taxonomy'] ) {
+                        case 'category':
+                            $this->is_category = true;
+                            break;
+                        case 'post_tag':
+                            $this->is_tag = true;
+                            break;
+                        default:
+                            $this->is_tax = true;
+                    }
+                }
+            }
+
+            unset( $tax_query_obj, $tax_query );
 
             _parse_meta_query( $qv );
@@ -1472 +1489 @@
 
     /*
-     * Parses various taxonomy related query vars and sets the appropriate query flags.
+     * Parses various taxonomy related query vars.
      *
      * @access protected
@@ -1585 +1602 @@
         }
 
-        $tax_query_obj = new WP_Tax_Query( $tax_query );
-
-        foreach ( $tax_query_obj->queries as $query ) {
-            if ( 'IN' == $query['operator'] ) {
-                switch ( $query['taxonomy'] ) {
-                    case 'category':
-                        $this->is_category = true;
-                        break;
-                    case 'post_tag':
-                        $this->is_tag = true;
-                        break;
-                    default:
-                        $this->is_tax = true;
-                }
-            }
-        }
-
-        return $tax_query_obj;
+        return new WP_Tax_Query( $tax_query );
     }