<!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>[14355] trunk/wp-includes/canonical.php: Serve a canonical redirection for
?p=, ?page_id=, ?attachment_id= url's for incorrect post_types (ie.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14355">14355</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-05-03 00:37:11 +0000 (Mon, 03 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Serve a canonical redirection for ?p=, ?page_id=, ?attachment_id= url's for incorrect post_types (ie. ?p=<page_id> will redirect to that page url). Fixes <a href="http://trac.wordpress.org/ticket/13125">#13125</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 (14354 => 14355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2010-05-03 00:21:25 UTC (rev 14354)
+++ trunk/wp-includes/canonical.php 2010-05-03 00:37:11 UTC (rev 14355)
</span><span class="lines">@@ -81,7 +81,15 @@
</span><span class="cx">
</span><span class="cx"> // These tests give us a WP-generated permalink
</span><span class="cx"> if ( is_404() ) {
</span><del>- $redirect_url = redirect_guess_404_permalink();
</del><ins>+
+ // Redirect ?page_id, ?p=, ?attachment_id= to their respective url's
+ $id = max( get_query_var('p'), get_query_var('page_id'), get_query_var('attachment_id'));
+ if ( $id && $redirect_url = get_permalink($id) )
+ $redirect['query'] = remove_query_arg(array('p', 'page_id', 'attachment_id'), $redirect['query']);
+
+ if ( ! $redirect_url )
+ $redirect_url = redirect_guess_404_permalink();
+
</ins><span class="cx"> } elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) {
</span><span class="cx"> // rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101
</span><span class="cx"> if ( is_attachment() && !empty($_GET['attachment_id']) && ! $redirect_url ) {
</span></span></pre>
</div>
</div>
</body>
</html>