Changeset 16259 for trunk/wp-includes/query.php

Timestamp:

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

Author:

scribu

Message:

Allow mix of 'taxonomy' => 'foo', 'term' => 'bar' and 'foo2' => 'bar2'. Props filosofo. Fixes #15363

File:

• trunk/wp-includes/query.php (modified) (1 diff)

trunk/wp-includes/query.php

@@ -1473 +1473 @@
                                 'operator' => 'IN',
                         );
-                } else {
-                        foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
-                                if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
-                                        $tax_query_defaults = array(
-                                                'taxonomy' => $taxonomy,
-                                                'field' => 'slug',
-                                                'operator' => 'IN'
-                                        );
-
-                                        if ( $t->rewrite['hierarchical'] ) {
-                                                $q[$t->query_var] = wp_basename( $q[$t->query_var] );
-                                        }
-
-                                        $term = str_replace( ' ', '+', $q[$t->query_var] );
-
-                                        if ( strpos($term, '+') !== false ) {
-                                                $terms = preg_split( '/[+]+/', $term );
-                                                foreach ( $terms as $term ) {
-                                                        $tax_query[] = array_merge( $tax_query_defaults, array(
-                                                                'terms' => array( $term )
-                                                        ) );
-                                                }
-                                        } else {
+                }
+
+                foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
+                        if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
+                                $tax_query_defaults = array(
+                                        'taxonomy' => $taxonomy,
+                                        'field' => 'slug',
+                                        'operator' => 'IN'
+                                );
+
+                                if ( $t->rewrite['hierarchical'] ) {
+                                        $q[$t->query_var] = wp_basename( $q[$t->query_var] );
+                                }
+
+                                $term = str_replace( ' ', '+', $q[$t->query_var] );
+
+                                if ( strpos($term, '+') !== false ) {
+                                        $terms = preg_split( '/[+]+/', $term );
+                                        foreach ( $terms as $term ) {
                                                 $tax_query[] = array_merge( $tax_query_defaults, array(
-                                                        'terms' => preg_split( '/[,]+/', $term )
+                                                        'terms' => array( $term )
                                                 ) );
                                         }
+                                } else {
+                                        $tax_query[] = array_merge( $tax_query_defaults, array(
+                                                'terms' => preg_split( '/[,]+/', $term )
+                                        ) );
                                 }
                         }