<!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>[18540] trunk: Remove the old root feed files.</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/18540">18540</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2011-08-12 01:41:23 +0000 (Fri, 12 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove the old root feed files. Bump the db version so rewrite rules can regenerate. Don't add these files to old_files to leave them on existing installs. fixes <a href="http://core.trac.wordpress.org/ticket/18384">#18384</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpatomphp">trunk/wp-atom.php</a></li>
<li><a href="#trunkwpcommentsrss2php">trunk/wp-commentsrss2.php</a></li>
<li><a href="#trunkwpfeedphp">trunk/wp-feed.php</a></li>
<li><a href="#trunkwprdfphp">trunk/wp-rdf.php</a></li>
<li><a href="#trunkwprssphp">trunk/wp-rss.php</a></li>
<li><a href="#trunkwprss2php">trunk/wp-rss2.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpatomphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-atom.php (18539 => 18540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-atom.php 2011-08-11 23:57:33 UTC (rev 18539)
+++ trunk/wp-atom.php 2011-08-12 01:41:23 UTC (rev 18540)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-<?php
-/**
- * Redirects to the Atom feed
- * This file is deprecated and only exists for backwards compatibility
- *
- * @package WordPress
- */
-
-require( './wp-load.php' );
-wp_redirect( get_bloginfo( 'atom_url' ), 301 );
-exit;
-?>
</del></span></pre></div>
<a id="trunkwpcommentsrss2php"></a>
<div class="delfile"><h4>Deleted: trunk/wp-commentsrss2.php (18539 => 18540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-commentsrss2.php 2011-08-11 23:57:33 UTC (rev 18539)
+++ trunk/wp-commentsrss2.php 2011-08-12 01:41:23 UTC (rev 18540)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-<?php
-/**
- * Redirects to the Comments RSS2 feed
- * This file is deprecated and only exists for backwards compatibility
- *
- * @package WordPress
- */
-
-require( './wp-load.php' );
-wp_redirect( get_bloginfo( 'comments_rss2_url' ), 301 );
-exit;
-?>
</del></span></pre></div>
<a id="trunkwpfeedphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-feed.php (18539 => 18540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-feed.php 2011-08-11 23:57:33 UTC (rev 18539)
+++ trunk/wp-feed.php 2011-08-12 01:41:23 UTC (rev 18540)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-<?php
-/**
- * Redirects to the default feed
- * This file is deprecated and only exists for backwards compatibility
- *
- * @package WordPress
- */
-
-require( './wp-load.php' );
-wp_redirect( get_bloginfo( get_default_feed() . '_url' ), 301 );
-exit;
-?>
</del></span></pre></div>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (18539 => 18540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2011-08-11 23:57:33 UTC (rev 18539)
+++ trunk/wp-includes/canonical.php 2011-08-12 01:41:23 UTC (rev 18540)
</span><span class="lines">@@ -218,11 +218,25 @@
</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>- if ( (in_array( get_default_feed(), array( 'rss', 'rdf' ) ) && 'feed' == get_query_var('feed')) || in_array( get_query_var('feed'), array( 'rss', 'rdf' ) ) )
</del><ins>+ if ( ( in_array( get_default_feed(), array( 'rss', 'rdf' ) ) && 'feed' == get_query_var('feed') ) || in_array( get_query_var('feed'), array( 'rss', 'rdf' ) ) )
</ins><span class="cx"> $addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == 'rss2' ) ? '' : 'rss2' ), 'feed' );
</span><span class="cx"> else
</span><span class="cx"> $addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
</span><span class="cx"> $redirect['query'] = remove_query_arg( 'feed', $redirect['query'] );
</span><ins>+ } elseif ( is_feed() && 'old' == get_query_var('feed') ) {
+ $old_feed_files = array(
+ 'wp-atom.php' => 'atom',
+ 'wp-commentsrss2.php' => 'comments_rss2',
+ 'wp-feed.php' => get_default_feed(),
+ 'wp-rdf.php' => 'rss2',
+ 'wp-rss.php' => 'rss2',
+ 'wp-rss2.php' => 'rss2',
+ );
+ if ( isset( $old_feed_files[ basename( $redirect['path'] ) ] ) ) {
+ $redirect_url = get_feed_link( $old_feed_files[ basename( $redirect['path'] ) ] );
+ wp_redirect( $redirect_url, 301 );
+ die();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( get_query_var('paged') > 0 ) {
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (18539 => 18540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2011-08-11 23:57:33 UTC (rev 18539)
+++ trunk/wp-includes/rewrite.php 2011-08-12 01:41:23 UTC (rev 18540)
</span><span class="lines">@@ -1498,13 +1498,8 @@
</span><span class="cx"> $home_path = parse_url( home_url() );
</span><span class="cx"> $robots_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'robots\.txt$' => $this->index . '?robots=1' ) : array();
</span><span class="cx">
</span><del>- // Default Feed rules - These are require to allow for the direct access files to work with permalink structure starting with %category%
- $default_feeds = array( '.*wp-atom.php$' => $this->index . '?feed=atom',
- '.*wp-rdf.php$' => $this->index . '?feed=rss2',
- '.*wp-rss.php$' => $this->index . '?feed=rss2',
- '.*wp-rss2.php$' => $this->index . '?feed=rss2',
- '.*wp-feed.php$' => $this->index . '?feed=feed',
- '.*wp-commentsrss2.php$' => $this->index . '?feed=rss2&withcomments=1');
</del><ins>+ // Old feed files
+ $old_feed_files = array( '.*wp-(atom|rdf|rss|rss2|feed|commentsrss2).php$' => $this->index . '?feed=old' );
</ins><span class="cx">
</span><span class="cx"> // Registration rules
</span><span class="cx"> $registration_pages = array();
</span><span class="lines">@@ -1558,9 +1553,9 @@
</span><span class="cx">
</span><span class="cx"> // Put them together.
</span><span class="cx"> if ( $this->use_verbose_page_rules )
</span><del>- $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $registration_pages, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
</del><ins>+ $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $old_feed_files, $registration_pages, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
</ins><span class="cx"> else
</span><del>- $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
</del><ins>+ $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $old_feed_files, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
</ins><span class="cx">
</span><span class="cx"> do_action_ref_array('generate_rewrite_rules', array(&$this));
</span><span class="cx"> $this->rules = apply_filters('rewrite_rules_array', $this->rules);
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (18539 => 18540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php 2011-08-11 23:57:33 UTC (rev 18539)
+++ trunk/wp-includes/version.php 2011-08-12 01:41:23 UTC (rev 18540)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 18226;
</del><ins>+$wp_db_version = 18537;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre></div>
<a id="trunkwprdfphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-rdf.php (18539 => 18540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-rdf.php 2011-08-11 23:57:33 UTC (rev 18539)
+++ trunk/wp-rdf.php 2011-08-12 01:41:23 UTC (rev 18540)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-<?php
-/**
- * Redirects to the RDF feed
- * This file is deprecated and only exists for backwards compatibility
- *
- * @package WordPress
- */
-
-require( './wp-load.php' );
-wp_redirect( get_bloginfo( 'rdf_url' ), 301 );
-exit;
-?>
</del></span></pre></div>
<a id="trunkwprssphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-rss.php (18539 => 18540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-rss.php 2011-08-11 23:57:33 UTC (rev 18539)
+++ trunk/wp-rss.php 2011-08-12 01:41:23 UTC (rev 18540)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-<?php
-/**
- * Redirects to the RSS feed
- * This file is deprecated and only exists for backwards compatibility
- *
- * @package WordPress
- */
-
-require( './wp-load.php' );
-wp_redirect( get_bloginfo( 'rss_url' ), 301 );
-exit;
-?>
</del></span></pre></div>
<a id="trunkwprss2php"></a>
<div class="delfile"><h4>Deleted: trunk/wp-rss2.php (18539 => 18540)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-rss2.php 2011-08-11 23:57:33 UTC (rev 18539)
+++ trunk/wp-rss2.php 2011-08-12 01:41:23 UTC (rev 18540)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-<?php
-/**
- * Redirects to the RSS2 feed
- * This file is deprecated and only exists for backwards compatibility
- *
- * @package WordPress
- */
-
-require( './wp-load.php' );
-wp_redirect( get_bloginfo( 'rss2_url' ), 301 );
-exit;
-?>
</del></span></pre>
</div>
</div>
</body>
</html>