Ticket #18084: 18084.2.patch

src/wp-includes/canonical.php

@@ -254 +254 @@
 
                 // 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( '#/comment-page-[0-9]+(/+)?$#', $redirect['path'] ) ) {
+                        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'] ) ) {
                                 // 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('#/comment-page-[0-9]+?(/+)?$#', '/', $redirect['path']); // strip off any existing comment paging
+                                $redirect['path'] = preg_replace("#/{$wp_rewrite->comments_pagination_base}-[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing comment paging
                         }
 
                         $addl_path = '';
@@ -302 +302 @@
                         }
 
                         if ( get_option('page_comments') && ( ( 'newest' == get_option('default_comments_page') && get_query_var('cpage') > 0 ) || ( 'newest' != get_option('default_comments_page') && get_query_var('cpage') > 1 ) ) ) {
-                                $addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit( 'comment-page-' . get_query_var('cpage'), 'commentpaged' );
+                                $addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit( $wp_rewrite->comments_pagination_base . '-' . get_query_var('cpage'), 'commentpaged' );
                                 $redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] );
                         }
 

src/wp-includes/comment-template.php

@@ -650 +650 @@
                         $args['page'] = ( !empty($in_comment_loop) ) ? get_query_var('cpage') : get_page_of_comment( $comment->comment_ID, $args );
 
                 if ( $wp_rewrite->using_permalinks() )
-                        $link = user_trailingslashit( trailingslashit( get_permalink( $comment->comment_post_ID ) ) . 'comment-page-' . $args['page'], 'comment' );
+                        $link = user_trailingslashit( trailingslashit( get_permalink( $comment->comment_post_ID ) ) . $wp_rewrite->comments_pagination_base . '-' . $args['page'], 'comment' );
                 else
                         $link = add_query_arg( 'cpage', $args['page'], get_permalink( $comment->comment_post_ID ) );
         } else {

src/wp-includes/link-template.php

@@ -2397 +2397 @@
         if ( 'newest' == get_option('default_comments_page') ) {
                 if ( $pagenum != $max_page ) {
                         if ( $wp_rewrite->using_permalinks() )
-                                $result = user_trailingslashit( trailingslashit($result) . 'comment-page-' . $pagenum, 'commentpaged');
+                                $result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
                         else
                                 $result = add_query_arg( 'cpage', $pagenum, $result );
                 }
         } elseif ( $pagenum > 1 ) {
                 if ( $wp_rewrite->using_permalinks() )
-                        $result = user_trailingslashit( trailingslashit($result) . 'comment-page-' . $pagenum, 'commentpaged');
+                        $result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
                 else
                         $result = add_query_arg( 'cpage', $pagenum, $result );
         }
@@ -2546 +2546 @@
                 'add_fragment' => '#comments'
         );
         if ( $wp_rewrite->using_permalinks() )
-                $defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . 'comment-page-%#%', 'commentpaged');
+                $defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
 
         $args = wp_parse_args( $args, $defaults );
         $page_links = paginate_links( $args );

src/wp-includes/rewrite.php

@@ -509 +509 @@
         var $pagination_base = 'page';
 
         /**
+         * Comments pagination permalink base.
+         *
+         * @since 4.1.0
+         * @access private
+         * @var string
+         */
+        var $comments_pagination_base = 'comment-page';
+
+        /**
          * Feed permalink base.
          *
          * @since 1.5.0
@@ -1264 +1273 @@
                 //build a regex to match the trackback and page/xx parts of URLs
                 $trackbackregex = 'trackback/?$';
                 $pageregex = $this->pagination_base . '/?([0-9]{1,})/?$';
-                $commentregex = 'comment-page-([0-9]{1,})/?$';
+                $commentregex = $this->comments_pagination_base . '-([0-9]{1,})/?$';
 
                 //build up an array of endpoint regexes to append => queries to append
                 if ( $endpoints ) {