Ticket #16415: 16415.2.diff

wp-includes/post.php

@@ -1041 +1041 @@
                         $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'] ) && isset( $args->has_archive ) )
                         $args->rewrite['feeds'] = (bool) $args->has_archive;
                 if ( ! isset( $args->rewrite['ep_mask'] ) ) {
                         if ( isset( $args->permalink_epmask ) )
@@ -1055 +1055 @@
                 else
                         add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
 
+                $archive_slug = ( is_string( $args->has_archive ) && strlen( $args->has_archive ) ) ? $args->has_archive : $args->rewrite['slug'];
+                if ( $args->rewrite['with_front'] )
+                        $archive_slug = substr( $wp_rewrite->front, 1 ) . $archive_slug;
+                else
+                        $archive_slug = $wp_rewrite->root . $archive_slug;
+
+                if ( $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' );
+                }
+
                 if ( $args->has_archive ) {
-                        $archive_slug = $args->has_archive === true ? $args->rewrite['slug'] : $args->has_archive;
-                        if ( $args->rewrite['with_front'] )
-                                $archive_slug = substr( $wp_rewrite->front, 1 ) . $archive_slug;
-                        else
-                                $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 ) {
-                                $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' );
-                        }
                         if ( $args->rewrite['pages'] )
                                 add_rewrite_rule( "{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$post_type" . '&paged=$matches[1]', 'top' );
                 }