Changeset 31459

Timestamp:

02/14/2015 03:47:02 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Replace hardcoded usage of comment-page with the comment pagination base.

props johnbillion, SergeyBiryukov, webord.
fixes #18084.

Location:

trunk/src/wp-includes

Files:

• canonical.php (modified) (2 diffs)
• comment-template.php (modified) (1 diff)
• link-template.php (modified) (3 diffs)
• rewrite.php (modified) (2 diffs)

trunk/src/wp-includes/canonical.php

@@ -255 +255 @@
         // 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
             }
 
@@ -303 +303 @@
 
             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'] );
             }

trunk/src/wp-includes/comment-template.php

@@ -659 +659 @@
 
         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 ) );

trunk/src/wp-includes/link-template.php

@@ -2425 +2425 @@
         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 );
@@ -2431 +2431 @@
     } 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 );
@@ -2574 +2574 @@
     );
     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 );

trunk/src/wp-includes/rewrite.php

@@ -505 +505 @@
 
     /**
+     * Comments pagination permalink base.
+     *
+     * @since 4.2.0
+     * @access private
+     * @var string
+     */
+    var $comments_pagination_base = 'comment-page';
+
+    /**
      * Feed permalink base.
      *
@@ -1257 +1266 @@
         $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