Changeset 16402

Timestamp:

11/16/2010 04:22:09 PM (16 years ago)

Author:

scribu

Message:

Don't pollute the 'tax_query' query var. See #12891

Location:

trunk/wp-includes

Files:

• query.php (modified) (2 diffs)
• taxonomy.php (modified) (1 diff)

trunk/wp-includes/query.php

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

trunk/wp-includes/taxonomy.php

@@ -594 +594 @@
 
         if ( 1 == count( $sql ) ) {
-                $ids = $wpdb->get_col( $sql[0] );
+                $r = $wpdb->get_col( $sql[0] );
         } else {
                 $r = "SELECT object_id FROM $wpdb->term_relationships WHERE 1=1";
                 foreach ( $sql as $query )
                         $r .= " AND object_id IN ($query)";
-
-                $ids = $wpdb->get_col( $r );
         }
 
         if ( !empty( $ids ) )
-                return " AND $object_id_column IN(" . implode( ', ', $ids ) . ")";
+                return " AND $object_id_column IN($r)";
         else
                 return ' AND 0 = 1';