Changeset 9318

Timestamp:

10/24/2008 07:36:43 AM (16 years ago)

Author:

markjaquith

Message:

Enable pretty permalinks for previous_ and next_comments_link(). props DD32, Viper007Bond. see #7942

Location:

trunk/wp-includes

Files:

• canonical.php (modified) (1 diff)
• link-template.php (modified) (5 diffs)

trunk/wp-includes/canonical.php

@@ -150 +150 @@
                 $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' );
             }

trunk/wp-includes/link-template.php

@@ -1149 +1149 @@
     $request = preg_replace('|^'. $home_root . '|', '', $request);
     $request = preg_replace('|^/+|', '', $request);
+    $request = preg_replace('|comment-page-[0-9]+/?$|', '', $request);
 
     $base = trailingslashit( get_bloginfo( 'home' ) );
@@ -1155 +1156 @@
     
     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';
@@ -1182 +1191 @@
 
     $page = get_query_var('cpage');
-    
+
     if ( !$page )
         $page = 1;
@@ -1210 +1219 @@
  */
 function previous_comments_link($label='') {
-    global $wp_query;
 
     if ( !is_singular() )
@@ -1223 +1231 @@
         return;
 
-    $nextpage = intval($page) - 1;
+    $prevpage = intval($page) - 1;
 
     if ( empty($label) )
         $label = __('« 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>';