Changeset 14162

Timestamp:

04/19/2010 12:03:01 PM (15 years ago)

Author:

dd32

Message:

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 #13047

Location:

trunk

Files:

• wp-feed.php (modified) (2 diffs)
• wp-includes/canonical.php (modified) (1 diff)

trunk/wp-feed.php

@@ -1 +1 @@
 <?php
 /**
- * Redirects to the RSS2 feed
+ * Redirects to the default feed
  * This file is deprecated and only exists for backwards compatibility
  *
@@ -8 +8 @@
 
 require( './wp-load.php' );
-wp_redirect( get_bloginfo( 'rss2_url' ), 301 );
+wp_redirect( get_bloginfo( get_default_feed() . '_url' ), 301 );
 
 ?>

trunk/wp-includes/canonical.php

@@ -191 +191 @@
                 if ( get_query_var( 'withcomments' ) )
                     $addl_path .= 'comments/';
-                $addl_path .= user_trailingslashit( 'feed/' . ( ( 'rss2' ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
+                $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'] );
             }