Changeset 15705

Timestamp:

10/04/2010 10:37:25 AM (14 years ago)

Author:

dd32

Message:

Introduce hierarchical taxonomy URL's, Can be enabled by setting 'hierarchical_url' to true upon taxonomy registration. See #12659

Location:

trunk/wp-includes

Files:

• canonical.php (modified) (2 diffs)
• taxonomy.php (modified) (4 diffs)

trunk/wp-includes/canonical.php

@@ -155 +155 @@
 
             $obj = $wp_query->get_queried_object();
-
-            if ( $term_count <= 1 && !empty($obj->term_id) && ( $tax_url = get_term_link((int)$obj->term_id, $obj->taxonomy) )
-                    && !is_wp_error($tax_url) && $redirect['query'] ) {
-                if ( is_category() ) {
-                    $redirect['query'] = remove_query_arg( array( 'category_name', 'category', 'cat'), $redirect['query']);
-                } elseif ( is_tag() ) {
-                    $redirect['query'] = remove_query_arg( array( 'tag', 'tag_id'), $redirect['query']);
-                } elseif ( is_tax() ) { // Custom taxonomies will have a custom query var, remove those too:
-                    $tax = get_taxonomy( $obj->taxonomy );
-                    if ( false !== $tax->query_var)
-                        $redirect['query'] = remove_query_arg($tax->query_var, $redirect['query']);
-                    else
-                        $redirect['query'] = remove_query_arg( array( 'term', 'taxonomy'), $redirect['query']);
+            if ( $term_count <= 1 && !empty($obj->term_id) && ( $tax_url = get_term_link((int)$obj->term_id, $obj->taxonomy) ) && !is_wp_error($tax_url) ) {
+                if ( !empty($redirect['query']) ) {
+                    if ( is_category() ) {
+                        $redirect['query'] = remove_query_arg( array( 'category_name', 'category', 'cat'), $redirect['query']);
+                    } elseif ( is_tag() ) {
+                        $redirect['query'] = remove_query_arg( array( 'tag', 'tag_id'), $redirect['query']);
+                    } elseif ( is_tax() ) { // Custom taxonomies will have a custom query var, remove those too:
+                        $tax = get_taxonomy( $obj->taxonomy );
+                        if ( false !== $tax->query_var)
+                            $redirect['query'] = remove_query_arg($tax->query_var, $redirect['query']);
+                        else
+                            $redirect['query'] = remove_query_arg( array( 'term', 'taxonomy'), $redirect['query']);
+                    }
                 }
-
                 $tax_url = parse_url($tax_url);
                 if ( ! empty($tax_url['query']) ) { // Custom taxonomies may only be accessable via ?taxonomy=..&term=..
@@ -177 +176 @@
                     $redirect['path'] = $tax_url['path'];
                 }
-
             }
         } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false ) {

trunk/wp-includes/taxonomy.php

@@ -271 +271 @@
 
     $defaults = array(  'hierarchical' => false,
+                        'hierarchical_url' => false,
                         'update_count_callback' => '',
                         'rewrite' => true,
@@ -296 +297 @@
             'with_front' => true,
         ));
-        $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
+        if ( $args['hierarchical'] && $args['hierarchical_url'] )
+            $wp_rewrite->add_rewrite_tag("%$taxonomy%", '.*?/?([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
+        else
+            $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
         $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
     }
@@ -2611 +2615 @@
 
     $slug = $term->slug;
+    $t = get_taxonomy($taxonomy);
 
     if ( empty($termlink) ) {
-        $t = get_taxonomy($taxonomy);
         if ( $t->query_var )
             $termlink = "?$t->query_var=$slug";
@@ -2620 +2624 @@
         $termlink = home_url($termlink);
     } else {
-        $termlink = str_replace("%$taxonomy%", $slug, $termlink);
+        if ( $t->hierarchical_url ) {
+            $hierarchical_slugs = array();
+            $ancestors = get_ancestors($term->term_id, $taxonomy);
+            foreach ( (array)$ancestors as $ancestor ) {
+                $ancestor_term = get_term($ancestor, $taxonomy);
+                $hierarchical_slugs[] = $ancestor_term->slug;
+            }
+            $hierarchical_slugs = array_reverse($hierarchical_slugs);
+            $hierarchical_slugs[] = $slug;
+            $termlink = str_replace("%$taxonomy%", implode('/', $hierarchical_slugs), $termlink);
+        } else {
+            $termlink = str_replace("%$taxonomy%", $slug, $termlink);
+        }
         $termlink = home_url( user_trailingslashit($termlink, 'category') );
     }