Ticket #4967: 4967.6.diff

wp-includes/canonical.php

@@ -218 +218 @@
                                 $addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
                                 if ( get_query_var( 'withcomments' ) )
                                         $addl_path .= 'comments/';
-                                $addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
+                                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'] );
                         }
 
@@ -295 +298 @@
                 // Clean up empty query strings
                 $redirect['query'] = trim(preg_replace( '#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query']), '&');
 
+                // Redirect obsolete feeds
+                $redirect['query'] = preg_replace( '#(^|&)feed=(rss|rdf)(&|$)#', '$1feed=rss2$3', $redirect['query'] );
+
                 // Remove redundant leading ampersands
                 $redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );
         }

wp-includes/feed.php

@@ -63 +63 @@
  * @return string Default feed, or for example 'rss2', 'atom', etc.
  */
 function get_default_feed() {
-        return apply_filters('default_feed', 'rss2');
+        $default_feed = apply_filters('default_feed', 'rss2');
+        return in_array( $default_feed, array( 'rss', 'rdf' ) ) ? 'rss2' : $default_feed;
 }
 
 /**