Changeset 11141

Timestamp:

04/30/2009 07:05:32 PM (17 years ago)

Author:

ryan

Message:

Fix registration of default taxonomies so that proper rewrite rules are written.

Location:

trunk/wp-includes

Files:

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

trunk/wp-includes/classes.php

@@ -254 +254 @@
 
                 foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t )
-                        if ( isset($t->query_var) )
+                        if ( $t->query_var )
                                 $taxonomy_query_vars[$t->query_var] = $taxonomy;
 

trunk/wp-includes/query.php

@@ -1400 +1400 @@
                                 $this->is_tax = false;
                                 foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
-                                        if ( isset($t->query_var) && isset($qv[$t->query_var]) && '' != $qv[$t->query_var] ) {
+                                        if ( $t->query_var && isset($qv[$t->query_var]) && '' != $qv[$t->query_var] ) {
                                                 $qv['taxonomy'] = $taxonomy;
                                                 $qv['term'] = $qv[$t->query_var];
@@ -1939 +1939 @@
                         } else {
                                 foreach ( $GLOBALS['wp_taxonomies'] as $taxonomy => $t ) {
-                                        if ( isset($t->query_var) && '' != $q[$t->query_var] ) {
+                                        if ( $t->query_var && '' != $q[$t->query_var] ) {
                                                 $terms = get_terms($taxonomy, array('slug'=>$q[$t->query_var]));
                                                 if ( !is_wp_error($terms) )

trunk/wp-includes/taxonomy.php

@@ -16 +16 @@
  */
 function create_initial_taxonomies() {
-        register_taxonomy( 'category', 'post', array('hierarchical' => true, 'update_count_callback' => '_update_post_term_count', 'label' => __('Categories')) ) ; 
-        register_taxonomy( 'post_tag', 'post', array('hierarchical' => false, 'update_count_callback' => '_update_post_term_count', 'label' => __('Post Tags')) ) ; 
-        register_taxonomy( 'link_category', 'link', array('hierarchical' => false) ) ; 
+        register_taxonomy( 'category', 'post', array('hierarchical' => true, 'update_count_callback' => '_update_post_term_count', 'label' => __('Categories'), 'query_var' => false, 'rewrite' => false) ) ; 
+        register_taxonomy( 'post_tag', 'post', array('hierarchical' => false, 'update_count_callback' => '_update_post_term_count', 'label' => __('Post Tags'), 'query_var' => false, 'rewrite' => false) ) ; 
+        register_taxonomy( 'link_category', 'link', array('hierarchical' => false, 'label' => __('Categories'), 'query_var' => false, 'rewrite' => false) ) ; 
 }
 add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority