Index: /trunk/wp-content/themes/default/comments.php
===================================================================
--- /trunk/wp-content/themes/default/comments.php (revision 10096)
+++ /trunk/wp-content/themes/default/comments.php (revision 10097)
@@ -21,7 +21,13 @@
+
+
+
Index: /trunk/wp-includes/comment.php
===================================================================
--- /trunk/wp-includes/comment.php (revision 10096)
+++ /trunk/wp-includes/comment.php (revision 10097)
@@ -514,4 +514,7 @@
global $wp_query;
+ if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) )
+ return $wp_query->max_num_comment_pages;
+
if ( !$comments || !is_array($comments) )
$comments = $wp_query->comments;
Index: /trunk/wp-includes/link-template.php
===================================================================
--- /trunk/wp-includes/link-template.php (revision 10096)
+++ /trunk/wp-includes/link-template.php (revision 10097)
@@ -1266,4 +1266,7 @@
$max_page = $wp_query->max_num_comment_pages;
+ if ( empty($max_page) )
+ $max_page = get_comment_pages_count();
+
if ( $nextpage > $max_page )
return;
@@ -1325,5 +1328,5 @@
if ( !$page )
$page = 1;
- $max_page = $wp_query->max_num_comment_pages;
+ $max_page = get_comment_pages_count();
$defaults = array(
'base' => add_query_arg( 'cpage', '%#%' ),