<!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" />
<title>[19970] trunk/wp-includes/canonical.php: Ensure that a category is part of the query before redirecting permalink structures containing %category%.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19970">19970</a></dd>
<dt>Author</dt> <dd>duck_</dd>
<dt>Date</dt> <dd>2012-02-21 19:00:06 +0000 (Tue, 21 Feb 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Ensure that a category is part of the query before redirecting permalink structures containing %category%. Fixes <a href="http://core.trac.wordpress.org/ticket/19241">#19241</a>.

This fixes incorrect canonical redirects for singular queries using custom rewrite rules.</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 (19969 => 19970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php        2012-02-21 17:39:05 UTC (rev 19969)
+++ trunk/wp-includes/canonical.php        2012-02-21 19:00:06 UTC (rev 19970)
</span><span class="lines">@@ -191,8 +191,8 @@
</span><span class="cx">                                 }
</span><span class="cx"> 
</span><span class="cx">                         }
</span><del>-                } elseif ( is_single() &amp;&amp; strpos($wp_rewrite-&gt;permalink_structure, '%category%') !== false ) {
-                        $category = get_category_by_path(get_query_var('category_name'));
</del><ins>+                } elseif ( is_single() &amp;&amp; strpos($wp_rewrite-&gt;permalink_structure, '%category%') !== false &amp;&amp; $cat = get_query_var( 'category_name' ) ) {
+                        $category = get_category_by_path( $cat );
</ins><span class="cx">                         $post_terms = wp_get_object_terms($wp_query-&gt;get_queried_object_id(), 'category', array('fields' =&gt; 'tt_ids'));
</span><span class="cx">                         if ( (!$category || is_wp_error($category)) || ( !is_wp_error($post_terms) &amp;&amp; !empty($post_terms) &amp;&amp; !in_array($category-&gt;term_taxonomy_id, $post_terms) ) )
</span><span class="cx">                                 $redirect_url = get_permalink($wp_query-&gt;get_queried_object_id());
</span><span class="lines">@@ -494,4 +494,4 @@
</span><span class="cx">         }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );
</del><span class="cx">\ No newline at end of file
</span><ins>+add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );
</ins></span></pre>
</div>
</div>

</body>
</html>