<!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>[15707] trunk/wp-includes/canonical.php:
Fix canonical redirection for permalinks containing %category% with nested categories and paging
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15707">15707</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-10-04 11:30:11 +0000 (Mon, 04 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix canonical redirection for permalinks containing %category% with nested categories and paging. Fixes <a href="http://trac.wordpress.org/ticket/13471">#13471</a> for trunk</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 (15706 => 15707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2010-10-04 11:00:36 UTC (rev 15706)
+++ trunk/wp-includes/canonical.php 2010-10-04 11:30:11 UTC (rev 15707)
</span><span class="lines">@@ -103,10 +103,6 @@
</span><span class="cx"> } elseif ( is_single() && !empty($_GET['p']) && ! $redirect_url ) {
</span><span class="cx"> if ( $redirect_url = get_permalink(get_query_var('p')) )
</span><span class="cx"> $redirect['query'] = remove_query_arg(array('p', 'post_type'), $redirect['query']);
</span><del>- if ( get_query_var( 'page' ) ) {
- $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
- $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
- }
</del><span class="cx"> } elseif ( is_single() && !empty($_GET['name']) && ! $redirect_url ) {
</span><span class="cx"> if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) )
</span><span class="cx"> $redirect['query'] = remove_query_arg('name', $redirect['query']);
</span><span class="lines">@@ -177,12 +173,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false ) {
</span><del>- $category = get_term_by('slug', get_query_var('category_name'), 'category');
</del><ins>+ $category = get_category_by_path(get_query_var('category_name'));
</ins><span class="cx"> $post_terms = wp_get_object_terms($wp_query->get_queried_object_id(), 'category', array('fields' => 'tt_ids'));
</span><span class="cx"> if ( (!$category || is_wp_error($category)) || ( !is_wp_error($post_terms) && !empty($post_terms) && !in_array($category->term_taxonomy_id, $post_terms) ) )
</span><span class="cx"> $redirect_url = get_permalink($wp_query->get_queried_object_id());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Post Paging
+ if ( is_singular() && get_query_var('page') && $redirect_url ) {
+ $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
+ $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+ }
+
</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></pre>
</div>
</div>
</body>
</html>