<!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>[14162] trunk:
Canonical redirect to correct location if rss2 is not default feed.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14162">14162</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-04-19 12:03:01 +0000 (Mon, 19 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Canonical redirect to correct location if rss2 is not default feed. wp-feed.php redirection to default feed type instad of rss2. Props solarissmoke. Fixes <a href="http://trac.wordpress.org/ticket/13047">#13047</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpfeedphp">trunk/wp-feed.php</a></li>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-feed.php (14161 => 14162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-feed.php 2010-04-19 12:01:32 UTC (rev 14161)
+++ trunk/wp-feed.php 2010-04-19 12:03:01 UTC (rev 14162)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * Redirects to the RSS2 feed
</del><ins>+ * Redirects to the default feed
</ins><span class="cx"> * This file is deprecated and only exists for backwards compatibility
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> require( './wp-load.php' );
</span><del>-wp_redirect( get_bloginfo( 'rss2_url' ), 301 );
</del><ins>+wp_redirect( get_bloginfo( get_default_feed() . '_url' ), 301 );
</ins><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (14161 => 14162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2010-04-19 12:01:32 UTC (rev 14161)
+++ trunk/wp-includes/canonical.php 2010-04-19 12:03:01 UTC (rev 14162)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx"> $addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
</span><span class="cx"> if ( get_query_var( 'withcomments' ) )
</span><span class="cx"> $addl_path .= 'comments/';
</span><del>- $addl_path .= user_trailingslashit( 'feed/' . ( ( 'rss2' == get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
</del><ins>+ $addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
</ins><span class="cx"> $redirect['query'] = remove_query_arg( 'feed', $redirect['query'] );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>