Ticket #15752: 15752.diff

wp-includes/taxonomy.php

@@ -533 +533 @@
         $where = array();
         $i = 0;
 
-        if ( isset( $tax_query['relation'] ) && strtoupper( $tax_query['relation'] ) == 'OR' ) {
+        _set_tax_query_defaults( $tax_query );
+
+        if ( strtoupper( $tax_query['relation'] ) == 'OR' ) {
                 $relation = 'OR';
         } else {
                 $relation = 'AND';
@@ -543 +545 @@
                 if ( ! is_array( $query ) )
                         continue;
 
-                extract( wp_parse_args( $query, array(
-                        'taxonomy' => array(),
-                        'terms' => array(),
-                        'include_children' => true,
-                        'field' => 'term_id',
-                        'operator' => 'IN',
-                ) ) );
+                extract( $query );
 
                 $taxonomies = (array) $taxonomy;
 
@@ -625 +621 @@
         return compact( 'join', 'where' );
 }
 
+function _set_tax_query_defaults( &$tax_query ) {
+        if ( ! isset( $tax_query['relation'] ) )
+                $tax_query['relation'] = 'AND';
+
+        $defaults = array(
+                'taxonomy' => array(),
+                'terms' => array(),
+                'include_children' => true,
+                'field' => 'term_id',
+                'operator' => 'IN',
+        );
+
+        foreach ( $tax_query as $i => $query ) {
+                if ( ! is_array( $query ) )
+                        continue;
+
+                $tax_query[$i] = array_merge( $defaults, $query );
+
+                $tax_query[$i]['terms'] = (array) $tax_query[$i]['terms'];
+        }
+}
+
 function _transform_terms( &$terms, $taxonomies, $field, $resulting_field ) {
         global $wpdb;
 

wp-includes/query.php

@@ -1491 +1491 @@
                                 'taxonomy' => $q['taxonomy'],
                                 'terms' => array( $q['term'] ),
                                 'field' => 'slug',
-                                'operator' => 'IN',
                         );
                 }
 
@@ -1500 +1499 @@
                                 $tax_query_defaults = array(
                                         'taxonomy' => $taxonomy,
                                         'field' => 'slug',
-                                        'operator' => 'IN'
                                 );
 
                                 if ( isset( $t->rewrite['hierarchical'] ) && $t->rewrite['hierarchical'] ) {
@@ -1550 +1548 @@
                         $tax_query[] = array(
                                 'taxonomy' => 'category',
                                 'terms' => $q['category__in'],
-                                'operator' => 'IN',
                                 'field' => 'term_id'
                         );
                 }
@@ -1561 +1558 @@
                                 'taxonomy' => 'category',
                                 'terms' => $q['category__not_in'],
                                 'operator' => 'NOT IN',
-                                'field' => 'term_id'
                         );
                 }
 
@@ -1570 +1566 @@
                         $tax_query[] = array(
                                 'taxonomy' => 'post_tag',
                                 'terms' => $qv['tag_id'],
-                                'operator' => 'IN',
-                                'field' => 'term_id'
                         );
                 }
 
@@ -1579 +1573 @@
                         $tax_query[] = array(
                                 'taxonomy' => 'post_tag',
                                 'terms' => $q['tag__in'],
-                                'operator' => 'IN',
-                                'field' => 'term_id'
                         );
                 }
 
@@ -1589 +1581 @@
                                 'taxonomy' => 'post_tag',
                                 'terms' => $q['tag__not_in'],
                                 'operator' => 'NOT IN',
-                                'field' => 'term_id'
                         );
                 }
 
+                _set_tax_query_defaults( $tax_query );
+
                 foreach ( $tax_query as $query ) {
+                        if ( ! is_array( $query ) )
+                                continue;
+
                         if ( 'IN' == $query['operator'] ) {
                                 switch ( $query['taxonomy'] ) {
                                         case 'category':
@@ -1945 +1941 @@
                 // Taxonomies
                 if ( !$this->is_singular ) {
                         $this->tax_query = $this->parse_tax_query( $q );
-                        if ( !empty( $this->tax_query ) ) {
+
+                        if ( ! empty( $this->tax_query ) ) {
                                 $clauses = call_user_func_array( 'get_tax_sql', array( $this->tax_query, $wpdb->posts, 'ID', &$this) );
 
                                 $join .= $clauses['join'];