Changeset 9317

Timestamp:

10/24/2008 07:27:19 AM (17 years ago)

Author:

markjaquith

Message:

Fix comment paging for when $comments is passed in. props Viper007Bond. see #7927

File:

• trunk/wp-includes/comment-template.php (modified) (4 diffs)

trunk/wp-includes/comment-template.php

@@ -731 +731 @@
  */
 function comments_template( $file = '/comments.php', $separate_comments = false ) {
-    global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity;
+    global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
 
     if ( ! (is_single() || is_page() || $withcomments) )
@@ -763 +763 @@
     }
 
-    if ( '' == get_query_var('cpage') && get_option('page_comments') && 'newest' == get_option('default_comments_page') ) 
+    $overridden_cpage = FALSE;
+    if ( '' == get_query_var('cpage') && get_option('page_comments') && 'newest' == get_option('default_comments_page') ) {
         set_query_var( 'cpage', get_comment_pages_count() );
+        $overridden_cpage = TRUE;
+    }
 
     define('COMMENTS_TEMPLATE', true);
@@ -1130 +1133 @@
  */
 function wp_list_comments($args = array(), $comments = null ) {
-    global $wp_query, $comment_alt, $comment_depth, $comment_thread_alt;
+    global $wp_query, $comment_alt, $comment_depth, $comment_thread_alt, $overridden_cpage;
 
     $comment_alt = $comment_thread_alt = 0;
@@ -1159 +1162 @@
             $r['page'] = get_query_var('cpage');
         } else {
-            $threaded = ( -1 == $r['depth'] ) ? false : true;
-            $r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($comments, $r['per_page'], $threaded) : 1;
-            set_query_var( 'cpage', $r['page'] );
+            if ( empty($overridden_cpage) ) {
+                $r['page'] = get_query_var('cpage');
+            } else {
+                $threaded = ( -1 == $r['depth'] ) ? false : true;
+                $r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($comments, $r['per_page'], $threaded) : 1;
+                set_query_var( 'cpage', $r['page'] );
+            }
         }
     }