Ticket #4967: 4967.4.diff

wp-includes/default-filters.php

@@ -234 +234 @@
         add_action( 'sanitize_comment_cookies', 'wp_cron' );
 
 // 2 Actions 2 Furious
-add_action( 'do_feed_rdf',                'do_feed_rdf',             10, 1 );
-add_action( 'do_feed_rss',                'do_feed_rss',             10, 1 );
+add_action( 'do_feed_rdf',                'do_feed_rss2',            10, 1 );
+add_action( 'do_feed_rss',                'do_feed_rss2',            10, 1 );
 add_action( 'do_feed_rss2',               'do_feed_rss2',            10, 1 );
 add_action( 'do_feed_atom',               'do_feed_atom',            10, 1 );
 add_action( 'do_pings',                   'do_all_pings',            10, 1 );

wp-includes/canonical.php

@@ -206 +206 @@
 
                 // paging and feeds
                 if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {
-                        while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( '#/comment-page-[0-9]+(/+)?$#', $redirect['path'] ) ) {
+                        while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( '#/comment-page-[0-9]+(/+)?$#', $redirect['path'] ) ) {
                                 // Strip off paging and feed
                                 $redirect['path'] = preg_replace("#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing paging
-                                $redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path']); // strip off feed endings
+                                $redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2|atom)(/+|$)#', '/', $redirect['path']); // strip off feed endings
                                 $redirect['path'] = preg_replace('#/comment-page-[0-9]+?(/+)?$#', '/', $redirect['path']); // strip off any existing comment paging
                         }
 
@@ -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'] );
                         }