Changeset 15860

Timestamp:

10/20/2010 12:07:23 PM (14 years ago)

Author:

scribu

Message:

Fix 'taxonomy' and 'term' query var logic. See #12891

Location:

trunk/wp-includes

Files:

• classes.php (modified) (1 diff)
• query.php (modified) (1 diff)

trunk/wp-includes/classes.php

@@ -282 +282 @@
                 }
 
-                if ( isset( $taxonomy_query_vars[$wpvar] ) ) {
-                    $this->query_vars['taxonomy'] = $taxonomy_query_vars[$wpvar];
-                    $this->query_vars['term'] = $this->query_vars[$wpvar];
-                } elseif ( isset($post_type_query_vars[$wpvar] ) ) {
+                if ( isset($post_type_query_vars[$wpvar] ) ) {
                     $this->query_vars['post_type'] = $post_type_query_vars[$wpvar];
                     $this->query_vars['name'] = $this->query_vars[$wpvar];

trunk/wp-includes/query.php

@@ -1453 +1453 @@
             $tax_query[] = array(
                 'taxonomy' => $q['taxonomy'],
-                'terms' => $q['term'],
+                'terms' => array( $q['term'] ),
+                'field' => 'slug',
             );
-        }
-
-        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] = basename($q[$t->query_var]);
-                    if ( $taxonomy == $q['taxonomy'] )
-                        $q['term'] = basename($q['term']);
-                }
-
-                $term = $q[$t->query_var];
-
-                if ( strpos($term, '+') !== false ) {
-                    $terms = preg_split( '/[+\s]+/', $term );
-                    foreach ( $terms as $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] = basename($q[$t->query_var]);
+                        if ( $taxonomy == $q['taxonomy'] )
+                            $q['term'] = basename($q['term']);
+                    }
+
+                    $term = $q[$t->query_var];
+
+                    if ( strpos($term, '+') !== false ) {
+                        $terms = preg_split( '/[+\s]+/', $term );
+                        foreach ( $terms as $term ) {
+                            $tax_query[] = array_merge( $tax_query_defaults, array(
+                                'terms' => array( $term )
+                            ) );
+                        }
+                    } else {
                         $tax_query[] = array_merge( $tax_query_defaults, array(
-                            'terms' => array( $term )
+                            'terms' => preg_split('/[,\s]+/', $term)
                         ) );
                     }
-                } else {
-                    $tax_query[] = array_merge( $tax_query_defaults, array(
-                        'terms' => preg_split('/[,\s]+/', $term)
-                    ) );
                 }
             }