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

Timestamp:

12/13/2010 03:11:02 PM (14 years ago)

Author:

scribu

Message:

Always call WP_Tax_Query::get_sql(). Fixes #15797

File:

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

trunk/wp-includes/query.php

@@ -1357 +1357 @@
 
             $this->parse_tax_query( $qv );
+
             foreach ( $this->tax_query->queries as $tax_query ) {
                 if ( 'IN' == $tax_query['operator'] ) {
@@ -1936 +1937 @@
         $this->parse_tax_query( $q );
 
+        $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
+
+        $join .= $clauses['join'];
+        $where .= $clauses['where'];
+
+        if ( $this->is_tax ) {
+            if ( empty($post_type) ) {
+                $post_type = 'any';
+                $post_status_join = true;
+            } elseif ( in_array('attachment', (array) $post_type) ) {
+                $post_status_join = true;
+            }
+        }
+
+        // Back-compat
         if ( $this->is_category || $this->is_tag || $this->is_tax ) {
-            $clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
-
-            $join .= $clauses['join'];
-            $where .= $clauses['where'];
-
-            if ( $this->is_tax ) {
-                if ( empty($post_type) ) {
-                    $post_type = 'any';
-                    $post_status_join = true;
-                } elseif ( in_array('attachment', (array) $post_type) ) {
-                    $post_status_join = true;
-                }
-            }
-
-            // Back-compat
             $tax_query_in = wp_list_filter( $this->tax_query->queries, array( 'operator' => 'IN' ) );
             if ( !empty( $tax_query_in ) ) {