Ticket #7942: 7942.2.diff

wp-includes/canonical.php

@@ -149 +149 @@
                         if ( is_feed() ) {
                                 $paged_redirect['path'] = user_trailingslashit( trailingslashit( $paged_redirect['path'] ) . 'feed/' . ( ( 'rss2' ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
                         }
-                        if ( get_query_var('cpage') > 1 ) {
+                        if ( ( 'newest' == get_option('default_comments_page') && get_query_var('cpage') > 0 ) || ( 'newest' != get_option('default_comments_page') && get_query_var('cpage') > 1 ) ) {
                                 $paged_redirect['path'] = user_trailingslashit( trailingslashit( $paged_redirect['path'] ) . 'comment-page-' . get_query_var('cpage'), 'commentpaged' );
                         }
                         $redirect_url = $paged_redirect['scheme'] . '://' . $paged_redirect['host'] . $paged_redirect['path'];

wp-includes/link-template.php

@@ -1148 +1148 @@
 
         $request = preg_replace('|^'. $home_root . '|', '', $request);
         $request = preg_replace('|^/+|', '', $request);
+        $request = preg_replace('|comment-page-[0-9]+/?$|', '', $request);
 
         $base = trailingslashit( get_bloginfo( 'home' ) );
 
         $result = $base . $request;
         
         if ( 'newest' == get_option('default_comments_page') ) {
-                if ( $pagenum != $max_page )
+                if ( $pagenum != $max_page ) {
+                        if ( $wp_rewrite->using_permalinks() )
+                                $result = user_trailingslashit( trailingslashit($base . $request) . 'comment-page-' . $pagenum, 'commentpaged');
+                        else
+                                $result = add_query_arg( 'cpage', $pagenum, $base . $request );
+                }
+        } elseif ( $pagenum > 1 ) {
+                if ( $wp_rewrite->using_permalinks() )
+                        $result = user_trailingslashit( trailingslashit($base . $request) . 'comment-page-' . $pagenum, 'commentpaged');
+                else
                         $result = add_query_arg( 'cpage', $pagenum, $base . $request );
-        } elseif ( $pagenum > 1 )
-                $result = add_query_arg( 'cpage', $pagenum, $base . $request );
+        }
 
         $result .= '#comments';
 
@@ -1181 +1190 @@
                 return;
 
         $page = get_query_var('cpage');
-        
+
         if ( !$page )
                 $page = 1;
 
@@ -1209 +1218 @@
  * @param string $label Optional. Label for comments link text.
  */
 function previous_comments_link($label='') {
-        global $wp_query;
 
         if ( !is_singular() )
                 return;
@@ -1222 +1230 @@
         if ( $page <= 1 )
                 return;
 
-        $nextpage = intval($page) - 1;
+        $prevpage = intval($page) - 1;
 
         if ( empty($label) )
                 $label = __('&laquo; Older Comments');
 
-        echo '<a href="' . clean_url(get_comments_pagenum_link($nextpage));
+        echo '<a href="' . clean_url(get_comments_pagenum_link($prevpage));
         $attr = apply_filters( 'previous_comments_link_attributes', '' );
         echo "\" $attr>". preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
 }