Ticket #43539: 43539.1.diff

src/wp-includes/canonical.php

@@ -294 +294 @@
 
                         // 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( "#/{$wp_rewrite->comments_pagination_base}-[0-9]+(/+)?$#", $redirect['path'] ) ) {
+
+                        $feeds = array();
+                        foreach ( $wp_rewrite->feeds as $_feed ) {
+                                $feeds[] = preg_quote( $_feed, '#' );
+                        }
+                        $feeds = implode( '|', $feeds );
+
+                        while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( "#/(comments/?)?($feeds)(/+)?$#", $redirect['path'] ) || preg_match( "#/{$wp_rewrite->comments_pagination_base}-[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/?)?($feeds)(/+|$)#", '/', $redirect['path'] ); // strip off feed endings
                                 $redirect['path'] = preg_replace( "#/{$wp_rewrite->comments_pagination_base}-[0-9]+?(/+)?$#", '/', $redirect['path'] ); // strip off any existing comment paging
                         }
 

src/wp-includes/class-wp-rewrite.php

@@ -858 +858 @@
          */
         public function generate_rewrite_rules( $permalink_structure, $ep_mask = EP_NONE, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true, $endpoints = true ) {
                 // Build a regex to match the feed section of URLs, something like (feed|atom|rss|rss2)/?
-                $feedregex2 = '';
-                foreach ( (array) $this->feeds as $feed_name ) {
-                        $feedregex2 .= $feed_name . '|';
+                $feedregex2 = array();
+                foreach ( $this->feeds as $feed ) {
+                        $feedregex2[] = preg_quote( $feed, '#' );
                 }
-                $feedregex2 = '(' . trim( $feedregex2, '|' ) . ')/?$';
+                $feedregex2 = '(' . implode( '|', $feedregex2 ) . ')/?$';
 
                 /*
                  * $feedregex is identical but with /feed/ added on as well, so URLs like <permalink>/feed/atom

tests/phpunit/tests/canonical.php

@@ -213 +213 @@
                         // Todo: Endpoints (feeds, trackbacks, etc), More fuzzed mixed query variables, comment paging, Home page (Static)
                 );
         }
+
+        /**
+         * @ticket 43539
+         */
+        public function test_canonical_custom_feed() {
+                add_feed( 'test', '__return_false' );
+                flush_rewrite_rules();
+
+                $this->assertCanonical( '/?feed=test', '/feed/test/', 43539 );
+                $this->assertCanonical( '/feed/test/', '/feed/test/', 43539 );
+                $this->assertCanonical( '/feed/test', '/feed/test/', 43539 );
+
+                // Cleanup
+                global $wp_rewrite;
+                array_pop( $wp_rewrite->feeds );
+        }
 }