From cafb51263a5a0fc64493504c8a93c7e9809b228d Mon Sep 17 00:00:00 2001
From: dd32 <dd32@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 19 Apr 2010 12:03:01 +0000
Subject: [PATCH] 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

git-svn-id: http://svn.automattic.com/wordpress/trunk@14162 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-feed.php               | 4 ++--
 wp-includes/canonical.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-feed.php b/wp-feed.php
index 78daa6d22..24cd8d672 100644
--- a/wp-feed.php
+++ b/wp-feed.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Redirects to the RSS2 feed
+ * 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( 'rss2_url' ), 301 );
+wp_redirect( get_bloginfo( get_default_feed() . '_url' ), 301 );
 
 ?>
\ No newline at end of file
diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index b4c8fcfe4..7d7da1bc8 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -190,7 +190,7 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
 				$addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
 				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'] );
 			}