Changeset 15705 for trunk/wp-includes/taxonomy.php

Timestamp:

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

Author:

dd32

Message:

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

File:

• trunk/wp-includes/taxonomy.php (modified) (4 diffs)

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') );
         }