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

git-svn-id: http://svn.automattic.com/wordpress/trunk@16259 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/query.php

@@ -1472,7 +1472,8 @@ class WP_Query extends WP_Object_Query {
 				'field' => 'slug',
 				'operator' => 'IN',
 			);
-		} else {
+		}
+
 		foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
 			if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
 				$tax_query_defaults = array(
@@ -1501,7 +1502,6 @@ class WP_Query extends WP_Object_Query {
 				}
 			}
 		}
-		}
 
 		// Category stuff
 		if ( !empty($q['cat']) && '0' != $q['cat'] && !$this->is_singular ) {