Changeset 16843 for trunk/wp-includes/taxonomy.php

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

File:

• trunk/wp-includes/taxonomy.php (modified) (3 diffs)

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'];
+    }
 }