<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15705] trunk/wp-includes: Introduce hierarchical taxonomy URL's,
Can be enabled by setting 'hierarchical_url'
to true upon taxonomy registration.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15705">15705</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-10-04 10:37:25 +0000 (Mon, 04 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce hierarchical taxonomy URL's, Can be enabled by setting 'hierarchical_url' to true upon taxonomy registration. See <a href="http://trac.wordpress.org/ticket/12659">#12659</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (15704 => 15705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2010-10-04 10:03:05 UTC (rev 15704)
+++ trunk/wp-includes/canonical.php 2010-10-04 10:37:25 UTC (rev 15705)
</span><span class="lines">@@ -154,21 +154,20 @@
</span><span class="cx"> $term_count += count( $tax_query['terms'] );
</span><span class="cx">
</span><span class="cx"> $obj = $wp_query->get_queried_object();
</span><del>-
- 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']);
</del><ins>+ 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']);
+ }
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> $tax_url = parse_url($tax_url);
</span><span class="cx"> if ( ! empty($tax_url['query']) ) { // Custom taxonomies may only be accessable via ?taxonomy=..&term=..
</span><span class="cx"> parse_str($tax_url['query'], $query_vars);
</span><span class="lines">@@ -176,7 +175,6 @@
</span><span class="cx"> } else { // Taxonomy is accessable via a "pretty-URL"
</span><span class="cx"> $redirect['path'] = $tax_url['path'];
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false ) {
</span><span class="cx"> $category = get_term_by('slug', get_query_var('category_name'), 'category');
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (15704 => 15705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-10-04 10:03:05 UTC (rev 15704)
+++ trunk/wp-includes/taxonomy.php 2010-10-04 10:37:25 UTC (rev 15705)
</span><span class="lines">@@ -270,6 +270,7 @@
</span><span class="cx"> $wp_taxonomies = array();
</span><span class="cx">
</span><span class="cx"> $defaults = array( 'hierarchical' => false,
</span><ins>+ 'hierarchical_url' => false,
</ins><span class="cx"> 'update_count_callback' => '',
</span><span class="cx"> 'rewrite' => true,
</span><span class="cx"> 'query_var' => $taxonomy,
</span><span class="lines">@@ -295,7 +296,10 @@
</span><span class="cx"> 'slug' => sanitize_title_with_dashes($taxonomy),
</span><span class="cx"> 'with_front' => true,
</span><span class="cx"> ));
</span><del>- $wp_rewrite->add_rewrite_tag("%$taxonomy%", '([^/]+)', $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=");
</del><ins>+ 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=");
</ins><span class="cx"> $wp_rewrite->add_permastruct($taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite']['with_front']);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2610,16 +2614,28 @@
</span><span class="cx"> $termlink = $wp_rewrite->get_extra_permastruct($taxonomy);
</span><span class="cx">
</span><span class="cx"> $slug = $term->slug;
</span><ins>+ $t = get_taxonomy($taxonomy);
</ins><span class="cx">
</span><span class="cx"> if ( empty($termlink) ) {
</span><del>- $t = get_taxonomy($taxonomy);
</del><span class="cx"> if ( $t->query_var )
</span><span class="cx"> $termlink = "?$t->query_var=$slug";
</span><span class="cx"> else
</span><span class="cx"> $termlink = "?taxonomy=$taxonomy&term=$slug";
</span><span class="cx"> $termlink = home_url($termlink);
</span><span class="cx"> } else {
</span><del>- $termlink = str_replace("%$taxonomy%", $slug, $termlink);
</del><ins>+ 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);
+ }
</ins><span class="cx"> $termlink = home_url( user_trailingslashit($termlink, 'category') );
</span><span class="cx"> }
</span><span class="cx"> return apply_filters('term_link', $termlink, $term, $taxonomy);
</span></span></pre>
</div>
</div>
</body>
</html>