Ticket #43746: 43746.2.diff

src/wp-includes/class-wp-post-type.php

@@ -486 +486 @@
                         if ( ! isset( $args['rewrite']['pages'] ) ) {
                                 $args['rewrite']['pages'] = true;
                         }
-                        if ( ! isset( $args['rewrite']['feeds'] ) || ! $args['has_archive'] ) {
+                        if ( ! isset( $args['rewrite']['feeds'] ) ) {
                                 $args['rewrite']['feeds'] = (bool) $args['has_archive'];
                         }
                         if ( ! isset( $args['rewrite']['ep_mask'] ) ) {
@@ -560 +560 @@
                                 if ( $this->rewrite['pages'] ) {
                                         add_rewrite_rule( "{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$this->name" . '&paged=$matches[1]', 'top' );
                                 }
+                        } else if ( $this->rewrite['feeds'] && $wp_rewrite->feeds ) {
+                                $archive_slug = $this->rewrite['slug'];
+                                if ( $this->rewrite['with_front'] ) {
+                                        $archive_slug = substr( $wp_rewrite->front, 1 ) . $archive_slug;
+                                } else {
+                                        $archive_slug = $wp_rewrite->root . $archive_slug;
+                                }
+
+                                $feeds = '(' . trim( implode( '|', $wp_rewrite->feeds ) ) . ')';
+                                add_rewrite_rule( "{$archive_slug}/feed/$feeds/?$", "index.php?post_type=$this->name" . '&feed=$matches[1]', 'top' );
+                                add_rewrite_rule( "{$archive_slug}/$feeds/?$", "index.php?post_type=$this->name" . '&feed=$matches[1]', 'top' );
                         }
 
                         $permastruct_args         = $this->rewrite;