Changeset 16849 for trunk/wp-includes/query.php

Timestamp:

12/09/2010 07:29:21 PM (13 years ago)

Author:

scribu

Message:

Introduce WP_Tax_Query. Fix canonical redirects in the process. See #15752

File:

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

trunk/wp-includes/query.php

@@ -715 +715 @@
      * @since 3.1.0
      * @access public
-     * @var array
-     */
-    var $tax_query = array();
+     * @var object WP_Tax_Query
+     */
+    var $tax_query;
 
     /**
@@ -1585 +1585 @@
         }
 
-        _set_tax_query_defaults( $tax_query );
-
-        foreach ( $tax_query as $query ) {
-            if ( ! is_array( $query ) )
-                continue;
-
+        $tax_query_obj = new WP_Tax_Query( $tax_query );
+
+        foreach ( $tax_query_obj->queries as $query ) {
             if ( 'IN' == $query['operator'] ) {
                 switch ( $query['taxonomy'] ) {
@@ -1605 +1602 @@
         }
 
-        return $tax_query;
+        return $tax_query_obj;
     }
 
@@ -1943 +1940 @@
             $this->tax_query = $this->parse_tax_query( $q );
 
-            $clauses = call_user_func_array( 'get_tax_sql', array( $this->tax_query, $wpdb->posts, 'ID', &$this) );
+            $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
 
             $join .= $clauses['join'];
@@ -1958 +1955 @@
 
             // Back-compat
-            $tax_query_in = wp_list_filter( $this->tax_query, array( 'operator' => 'IN' ) );
+            $tax_query_in = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'IN' ) );
             if ( !empty( $tax_query_in ) ) {
                 if ( !isset( $q['taxonomy'] ) ) {
@@ -2658 +2655 @@
         $this->queried_object_id = 0;
 
-        $tax_query_in = wp_list_filter( $this->tax_query, array( 'operator' => 'IN' ) );
+        $tax_query_in = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'IN' ) );
         if ( !empty( $tax_query_in ) ) {
             $query = reset( $tax_query_in );