Changeset 15765

Timestamp:

10/09/2010 10:19:15 AM (9 years ago)

Author:

scribu

Message:

Get rid of redundant ->tax_query. See #12891

Location:

trunk/wp-includes

Files:

• canonical.php (modified) (1 diff)
• classes.php (modified) (2 diffs)
• query.php (modified) (6 diffs)

trunk/wp-includes/canonical.php

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

trunk/wp-includes/classes.php

@@ -565 +565 @@
 
     /*
-     * List of taxonomy queries
-     *
-     * A query is an associative array:
-     * - 'taxonomy' string|array The taxonomy being queried
-     * - 'terms' string|array The list of terms
-     * - 'field' string (optional) Which term field is being used.
-     *      Possible values: 'term_id', 'slug' or 'name'
-     *      Default: 'slug'
-     * - 'operator' string (optional)
-     *      Possible values: 'IN' and 'NOT IN'.
-     *      Default: 'IN'
-     * - 'include_children' bool (optional) Whether to include child terms.
-     *      Default: true
-     *
-     * @since 3.1.0
-     * @access public
-     * @var array
-     */
-    var $tax_query = array();
-
-    /*
      * Populates the $meta_query property
      *
@@ -695 +674 @@
      * @since 3.1.0
      *
-     * @uses $this->tax_query
+     * @param array $tax_query List of taxonomy queries. A single taxonomy query is an associative array:
+     * - 'taxonomy' string|array The taxonomy being queried
+     * - 'terms' string|array The list of terms
+     * - 'field' string (optional) Which term field is being used.
+     *      Possible values: 'term_id', 'slug' or 'name'
+     *      Default: 'slug'
+     * - 'operator' string (optional)
+     *      Possible values: 'IN' and 'NOT IN'.
+     *      Default: 'IN'
+     * - 'include_children' bool (optional) Whether to include child terms.
+     *      Default: true
      *
      * @param string $object_id_column
      * @return string
      */
-    function get_tax_sql( $object_id_column ) {
+    function get_tax_sql( $tax_query, $object_id_column ) {
         global $wpdb;
 
         $sql = array();
-        foreach ( $this->tax_query as $query ) {
+        foreach ( $tax_query as $query ) {
             if ( !isset( $query['include_children'] ) )
                 $query['include_children'] = true;

trunk/wp-includes/query.php

@@ -1082 +1082 @@
         unset($this->query);
         $this->query_vars = array();
-        $this->tax_query = array();
         $this->meta_query = array();
         unset($this->queried_object);
@@ -1400 +1399 @@
     }
 
-    function parse_tax_query( $q ) {
+    /*
+     * Populates the 'tax_query' property
+     *
+     * @access protected
+     * @since 3.1.0
+     *
+     * @param array &$q The query variables
+     */
+    function parse_tax_query( &$q ) {
         if ( ! empty( $q['tax_query'] ) && is_array( $q['tax_query'] ) ) {
             $tax_query = $q['tax_query'];
@@ -1503 +1510 @@
         }
 
-        $this->tax_query = $tax_query;
-
-        foreach ( $this->tax_query as $query ) {
+        $q['tax_query'] = $tax_query;
+
+        foreach ( $q['tax_query'] as $query ) {
             if ( 'IN' == $query['operator'] ) {
                 switch ( $query['taxonomy'] ) {
@@ -1846 +1853 @@
 
         // Taxonomies
-        if ( !empty( $this->tax_query ) ) {
+        if ( !empty( $q['tax_query'] ) ) {
             if ( empty($post_type) ) {
                 $post_type = 'any';
@@ -1854 +1861 @@
             }
 
-            $where .= $this->get_tax_sql( "$wpdb->posts.ID" );
+            $where .= $this->get_tax_sql( $q['tax_query'], "$wpdb->posts.ID" );
 
             // Back-compat
             if ( !empty( $ids ) ) {
-                $cat_query = wp_list_filter( $this->tax_query, array( 'taxonomy' => 'category' ) );
+                $cat_query = wp_list_filter( $q['tax_query'], array( 'taxonomy' => 'category' ) );
                 if ( !empty( $cat_query ) ) {
                     $cat_query = reset( $cat_query );
@@ -2515 +2522 @@
         $this->queried_object_id = 0;
 
-        if ( $this->tax_query ) {
-            $query = reset( $this->tax_query );
-            if ( 'term_id' == $query['field']  )
+        $tax_query = $this->get('tax_query');
+
+        if ( !empty( $tax_query ) ) {
+            $query = reset( $tax_query );
+            if ( 'term_id' == $query['field'] )
                 $term = get_term( reset( $query['terms'] ), $query['taxonomy'] );
             else