Changeset 16404

Timestamp:

11/16/2010 04:36:20 PM (16 years ago)

Author:

scribu

Message:

Revert [16402] outright. Causes issues with themes. See #12891

File:

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

trunk/wp-includes/query.php

@@ -1932 +1932 @@
 
                 // Taxonomies
-                $tax_query = $this->parse_tax_query( $q );
-
-                if ( !empty( $tax_query ) ) {
+                $q['tax_query'] = $this->parse_tax_query( $q );
+                if ( !empty( $q['tax_query'] ) ) {
                         if ( empty($post_type) ) {
                                 $post_type = 'any';
@@ -1942 +1941 @@
                         }
 
-                        $where .= get_tax_sql( $tax_query, "$wpdb->posts.ID" );
+                        $where .= get_tax_sql( $q['tax_query'], "$wpdb->posts.ID" );
 
                         // Back-compat
-                        $tax_query_in = wp_list_filter( $tax_query, array( 'operator' => 'IN' ) );
+                        $tax_query_in = wp_list_filter( $q['tax_query'], array( 'operator' => 'IN' ) );
                         if ( !empty( $tax_query_in ) ) {
                                 if ( !isset( $q['taxonomy'] ) ) {