<!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>[13091] trunk/wp-includes/canonical.php:
Canonicalisation of the Taxonomy urls.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13091">13091</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-13 06:17:59 +0000 (Sat, 13 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Canonicalisation of the Taxonomy urls. Redirect /category/child/ to /category/parent/child/. Fix striping of slashes to use $redirect instead of $original. See <a href="http://trac.wordpress.org/ticket/8948">#8948</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.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 (13090 => 13091)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2010-02-13 06:14:37 UTC (rev 13090)
+++ trunk/wp-includes/canonical.php 2010-02-13 06:17:59 UTC (rev 13091)
</span><span class="lines">@@ -139,6 +139,21 @@
</span><span class="cx"> $redirect['query'] = remove_query_arg('author', $redirect['query']);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // redirect sub-terms of taxonomies to their correct urls
+ if ( is_category() || is_tax() ) {
+ if ( is_category() ) {
+ $taxonomy = 'category';
+ $slug = get_query_var('category_name');
+ } else {
+ $taxonomy = get_query_var('taxonomy');
+ $slug = get_query_var('term');
+ }
+ if ( $tax_url = get_term_link($slug, $taxonomy) ) {
+ $tax_url = parse_url($tax_url);
+ $redirect['path'] = $tax_url['path'];
+ }
+ }
+
</ins><span class="cx"> // paging and feeds
</span><span class="cx"> if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {
</span><span class="cx"> if ( !$redirect_url )
</span><span class="lines">@@ -257,7 +272,7 @@
</span><span class="cx">
</span><span class="cx"> // Strip multiple slashes out of the URL
</span><span class="cx"> if ( strpos($original['path'], '//') > -1 )
</span><del>- $redirect['path'] = preg_replace('|/+|', '/', $original['path']);
</del><ins>+ $redirect['path'] = preg_replace('|/+|', '/', $redirect['path']);
</ins><span class="cx">
</span><span class="cx"> // Always trailing slash the Front Page URL
</span><span class="cx"> if ( trailingslashit( $redirect['path'] ) == trailingslashit( $user_home['path'] ) )
</span></span></pre>
</div>
</div>
</body>
</html>