Ticket #35794: patch.txt

[1;33mdiff --git a/wp/wp-includes/canonical.php b/wp/wp-includes/canonical.php[m
[1;33mindex 9a2a8e9..5aefe2b 100644[m
[1;33m--- a/wp/wp-includes/canonical.php[m
[1;33m+++ b/wp/wp-includes/canonical.php[m
[1;35m@@ -234,11 +234,10 @@[m [mfunction redirect_canonical( $requested_url = null, $do_redirect = true ) {[m

                // paging and feeds[m
                if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {[m
[31m$feedssubpattern = implode('|', array_map(function($val) { return preg_quote($val, '#'); }, $wp_rewrite->feeds));[m                       while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( [31m'#/(comments/?)?(' . $feedssubpattern . ')(/+)?$#',[m[32m'#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#',[m $redirect['path'] ) || preg_match( '#/comment-page-[0-9]+(/+)?$#', $redirect['path'] ) ) {
                                // Strip off paging and feed[m
                                $redirect['path'] = preg_replace("#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing paging[m
                                $redirect['path'] = [31mpreg_replace('#/(comments/?)?(' . $feedssubpattern . ')(/+|$)#',[m[32mpreg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#',[m '/', $redirect['path']); // strip off feed endings
                                $redirect['path'] = preg_replace('#/comment-page-[0-9]+?(/+)?$#', '/', $redirect['path']); // strip off any existing comment paging[m
                        }[m

[1;35m@@ -456,7 +455,7 @@[m [mfunction redirect_canonical( $requested_url = null, $do_redirect = true ) {[m
                        exit();[m
                } else {[m
                        // Debug[m
                        [32m//[m die("1: $redirect_url<br />2: " . redirect_canonical( $redirect_url, false ) );
                        return false;[m
                }[m
        } else {[m