Ticket #24867: 24867.diff

post.php

@@ -1239 +1239 @@
                         $args->rewrite['with_front'] = true;
                 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'] ) ) {
                         if ( isset( $args->permalink_epmask ) )
@@ -1261 +1261 @@
                                 $archive_slug = $wp_rewrite->root . $archive_slug;
 
                         add_rewrite_rule( "{$archive_slug}/?$", "index.php?post_type=$post_type", 'top' );
-                        if ( $args->rewrite['feeds'] && $wp_rewrite->feeds ) {
+                        if ( $args->has_archive && $args->rewrite['feeds'] && $wp_rewrite->feeds ) {
                                 $feeds = '(' . trim( implode( '|', $wp_rewrite->feeds ) ) . ')';
                                 add_rewrite_rule( "{$archive_slug}/feed/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );
                                 add_rewrite_rule( "{$archive_slug}/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );