Changeset 18540

Timestamp:

08/12/2011 01:41:23 AM (13 years ago)

Author:

nacin

Message:

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 #18384.

Location:

trunk

Files:

• wp-atom.php (deleted)
• wp-commentsrss2.php (deleted)
• wp-feed.php (deleted)
• wp-includes/canonical.php (modified) (1 diff)
• wp-includes/rewrite.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)
• wp-rdf.php (deleted)
• wp-rss.php (deleted)
• wp-rss2.php (deleted)

trunk/wp-includes/canonical.php

@@ -219 +219 @@
                 if ( get_query_var( 'withcomments' ) )
                     $addl_path .= 'comments/';
-                if ( (in_array( get_default_feed(), array( 'rss', 'rdf' ) ) && 'feed' == get_query_var('feed')) || in_array( get_query_var('feed'), array( 'rss', 'rdf' ) ) )
+                if ( ( in_array( get_default_feed(), array( 'rss', 'rdf' ) ) && 'feed' == get_query_var('feed') ) || in_array( get_query_var('feed'), array( 'rss', 'rdf' ) ) )
                     $addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == 'rss2' ) ? '' : 'rss2' ), 'feed' );
                 else
                     $addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
                 $redirect['query'] = remove_query_arg( 'feed', $redirect['query'] );
+            } 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();
+                }
             }
 

trunk/wp-includes/rewrite.php

@@ -1499 +1499 @@
         $robots_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'robots\.txt$' => $this->index . '?robots=1' ) : array();
 
-        // 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');
+        // Old feed files
+        $old_feed_files = array( '.*wp-(atom|rdf|rss|rss2|feed|commentsrss2).php$' => $this->index . '?feed=old' );
 
         // Registration rules
@@ -1559 +1554 @@
         // Put them together.
         if ( $this->use_verbose_page_rules )
-            $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);
+            $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);
         else
-            $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);
+            $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);
 
         do_action_ref_array('generate_rewrite_rules', array(&$this));

trunk/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 18226;
+$wp_db_version = 18537;
 
 /**