Changeset 16414

Timestamp:

11/17/2010 02:04:08 AM (16 years ago)

Author:

scribu

Message:

Re-introduce ->tax_query as a read-only var. See #12891

Location:

trunk/wp-includes

Files:

• canonical.php (modified) (1 diff)
• query.php (modified) (4 diffs)

trunk/wp-includes/canonical.php

@@ -147 +147 @@
 
                         $term_count = 0;
-                        foreach ( $wp_query->get('tax_query') as $tax_query )
+                        foreach ( $wp_query->tax_query as $tax_query )
                                 $term_count += count( $tax_query['terms'] );
 

trunk/wp-includes/query.php

@@ -708 +708 @@
          */
         var $query_vars = array();
+
+        /**
+         * Taxonomy query, as passed to get_tax_sql()
+         *
+         * @since 3.1.0
+         * @access public
+         * @var array
+         */
+        var $tax_query = array();
 
         /**
@@ -1932 +1941 @@
 
                 // Taxonomies
-                $q['tax_query'] = $this->parse_tax_query( $q );
-                if ( !empty( $q['tax_query'] ) ) {
-                        $clauses = call_user_func_array( 'get_tax_sql', array( $q['tax_query'], $wpdb->posts, 'ID', &$this) );
+                $this->tax_query = $this->parse_tax_query( $q );
+                if ( !empty( $this->tax_query ) ) {
+                        $clauses = call_user_func_array( 'get_tax_sql', array( $this->tax_query, $wpdb->posts, 'ID', &$this) );
 
                         $join .= $clauses['join'];
@@ -1947 +1956 @@
 
                         // Back-compat
-                        $tax_query_in = wp_list_filter( $q['tax_query'], array( 'operator' => 'IN' ) );
+                        $tax_query_in = wp_list_filter( $this->tax_query, array( 'operator' => 'IN' ) );
                         if ( !empty( $tax_query_in ) ) {
                                 if ( !isset( $q['taxonomy'] ) ) {
@@ -2647 +2656 @@
                 $this->queried_object_id = 0;
 
-                $tax_query = $this->get('tax_query');
-
-                if ( !empty( $tax_query ) ) {
-                        $query = reset( $tax_query );
+                if ( !empty( $this->tax_query ) ) {
+                        $query = reset( $this->tax_query );
 
                         if ( 'term_id' == $query['field'] )