Changeset 7940

Timestamp:

05/16/2008 02:35:24 AM (18 years ago)

Author:

matt

Message:

Fix default taxonomy query var. Populate taxonomy and term query vars ASAP. Fixes template fall-through. Hat tip: andy

Location:

trunk/wp-includes

Files:

• classes.php (modified) (2 diffs)
• taxonomy.php (modified) (1 diff)

trunk/wp-includes/classes.php

@@ -141 +141 @@
                 $this->public_query_vars = apply_filters('query_vars', $this->public_query_vars);
 
+                foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t )
+                        if ( isset($t->query_var) )
+                                $taxonomy_query_vars[$t->query_var] = $taxonomy;
+
                 for ($i=0; $i<count($this->public_query_vars); $i += 1) {
                         $wpvar = $this->public_query_vars[$i];
@@ -154 +158 @@
                                 $this->query_vars[$wpvar] = $perma_query_vars[$wpvar];
 
-                        if ( !empty( $this->query_vars[$wpvar] ) )
+                        if ( !empty( $this->query_vars[$wpvar] ) ) {
                                 $this->query_vars[$wpvar] = (string) $this->query_vars[$wpvar];
+                                if ( in_array( $wpvar, $taxonomy_query_vars ) ) {
+                                        $this->query_vars['taxonomy'] = $taxonomy_query_vars[$wpvar];
+                                        $this->query_vars['term'] = $this->query_vars[$wpvar];
+                                }
+                        }
                 }
 

trunk/wp-includes/taxonomy.php

@@ -160 +160 @@
 
         if ( false !== $args['query_var'] && !empty($wp) ) {
-                if ( empty($args['query_var']) )
+                if ( true === $args['query_var'] )
                         $args['query_var'] = $taxonomy;
                 $args['query_var'] = sanitize_title_with_dashes($args['query_var']);