From 011b0bd2b04786e5389511f3853cf48e60b0e5e2 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 3 Mar 2011 15:56:08 +0000
Subject: [PATCH] Do not do canonical redirects for unregistered feeds. fixes
 #16704 for 3.1

git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17499 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/canonical.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index ff8a495dd4..2c313e5a8d 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -195,7 +195,7 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 			}
 
 			$addl_path = '';
-			if ( is_feed() ) {
+			if ( is_feed() && in_array( get_query_var('feed'), $wp_rewrite->feeds ) ) {
 				$addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
 				if ( get_query_var( 'withcomments' ) )
 					$addl_path .= 'comments/';