<!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>[17549] branches/3.1/wp-includes/canonical.php: Reinstate [15462] for 3.1;
Prevents canonical redirects for custom rewrite rules for taxonomies.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17549">17549</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2011-03-24 01:18:41 +0000 (Thu, 24 Mar 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reinstate <a href="http://trac.wordpress.org/changeset/15462">[15462]</a> for 3.1; Prevents canonical redirects for custom rewrite rules for taxonomies. See <a href="http://trac.wordpress.org/ticket/16627">#16627</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches31wpincludescanonicalphp">branches/3.1/wp-includes/canonical.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches31wpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: branches/3.1/wp-includes/canonical.php (17548 => 17549)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.1/wp-includes/canonical.php 2011-03-23 21:25:35 UTC (rev 17548)
+++ branches/3.1/wp-includes/canonical.php 2011-03-24 01:18:41 UTC (rev 17549)
</span><span class="lines">@@ -150,7 +150,7 @@
</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) ) {
</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) && !empty($redirect['query']) ) {
</ins><span class="cx"> if ( !empty($redirect['query']) ) {
</span><span class="cx"> if ( is_category() ) {
</span><span class="cx"> $redirect['query'] = remove_query_arg( array( 'category_name', 'category', 'cat'), $redirect['query']);
</span></span></pre>
</div>
</div>
</body>
</html>