Changeset 16843

Timestamp:

12/09/2010 05:05:40 PM (14 years ago)

Author:

scribu

Message:

Set tax query defaults earlier, for notice prevention and convenience. See #15752

Location:

trunk/wp-includes

Files:

• query.php (modified) (8 diffs)
• taxonomy.php (modified) (3 diffs)

trunk/wp-includes/query.php

@@ -1492 +1492 @@
                 'terms' => array( $q['term'] ),
                 'field' => 'slug',
-                'operator' => 'IN',
             );
         }
@@ -1501 +1500 @@
                     'taxonomy' => $taxonomy,
                     'field' => 'slug',
-                    'operator' => 'IN'
                 );
 
@@ -1551 +1549 @@
                 'taxonomy' => 'category',
                 'terms' => $q['category__in'],
-                'operator' => 'IN',
                 'field' => 'term_id'
             );
@@ -1562 +1559 @@
                 'terms' => $q['category__not_in'],
                 'operator' => 'NOT IN',
-                'field' => 'term_id'
             );
         }
@@ -1571 +1567 @@
                 'taxonomy' => 'post_tag',
                 'terms' => $qv['tag_id'],
-                'operator' => 'IN',
-                'field' => 'term_id'
             );
         }
@@ -1580 +1574 @@
                 'taxonomy' => 'post_tag',
                 'terms' => $q['tag__in'],
-                'operator' => 'IN',
-                'field' => 'term_id'
             );
         }
@@ -1590 +1582 @@
                 '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'] ) {
@@ -1946 +1942 @@
         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) );
 

trunk/wp-includes/taxonomy.php

@@ -534 +534 @@
     $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 {
@@ -544 +546 @@
             continue;
 
-        extract( wp_parse_args( $query, array(
-            'taxonomy' => array(),
-            'terms' => array(),
-            'include_children' => true,
-            'field' => 'term_id',
-            'operator' => 'IN',
-        ) ) );
+        extract( $query );
 
         $taxonomies = (array) $taxonomy;
@@ -624 +620 @@
 
     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'];
+    }
 }