Changeset 15824

Timestamp:

10/17/2010 04:36:26 AM (16 years ago)

Author:

dd32

Message:

Move hierarchical_url to $argsrewritehierarchical

Location:

trunk/wp-includes

Files:

• query.php (modified) (1 diff)
• taxonomy.php (modified) (4 diffs)

trunk/wp-includes/query.php

@@ -1460 +1460 @@
                                 $term = $q[$t->query_var];
 
-                                if ( $t->hierarchical_url ) {
+                                if ( $t->rewrite['hierarchical'] ) {
                                         $tax_query[] = array_merge( $tax_query_defaults, array(
                                                 'terms' => array( basename( $term ) )

trunk/wp-includes/taxonomy.php

@@ -18 +18 @@
         register_taxonomy( 'category', 'post', array(
                 'hierarchical' => true,
-                'hierarchical_url' => true,
                 'update_count_callback' => '_update_post_term_count',
                 'query_var' => 'category_name',
@@ -287 +286 @@
 
         $defaults = array(      'hierarchical' => false,
-                                                'hierarchical_url' => false,
                                                 'update_count_callback' => '',
                                                 'rewrite' => true,
@@ -308 +306 @@
         }
 
-        if ( false !== $args['rewrite'] && '' != get_option('permalink_structure') ) {
+        if ( false !== $args['rewrite'] && '' != get_option('permalink_structure') && !empty($wp_rewrite) ) {
                 $args['rewrite'] = wp_parse_args($args['rewrite'], array(
                         'slug' => sanitize_title_with_dashes($taxonomy),
                         'with_front' => true,
+                        'hierarchical' => false
                 ));
-                if ( $args['hierarchical'] && $args['hierarchical_url'] )
-                        $wp_rewrite->add_rewrite_tag("%$taxonomy%", '.*?/?([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
+
+                if ( $args['hierarchical'] && $args['rewrite']['hierarchical'] )
+                        $tag = '(.*?)';
                 else
-                        $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
+                        $tag = '([^/]+)';
+
+                $wp_rewrite->add_rewrite_tag("%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
                 $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
         }
@@ -2621 +2623 @@
                 $termlink = home_url($termlink);
         } else {
-                if ( $t->hierarchical_url ) {
+                if ( $t->rewrite['hierarchical'] ) {
                         $hierarchical_slugs = array();
                         $ancestors = get_ancestors($term->term_id, $taxonomy);