Ticket #7927: 7927.2.diff

wp-includes/comment-template.php

@@ -1155 +1155 @@
         }
 
         if ( '' === $r['page'] ) {
-                if ( empty($comments) ) {
-                        $r['page'] = get_query_var('cpage');
-                } else {
+                if ( 'newest' == get_option('default_comments_page') ) {
                         $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'] );
+                        set_query_var( 'cpage', get_comment_pages_count($comments, $r['per_page'], $threaded) );
                 }
+                $r['page'] = get_query_var('cpage');
         }
         // Validation check
         $r['page'] = intval($r['page']);
@@ -1169 +1167 @@
                 $r['page'] = 1;
 
         if ( '' == $r['reverse_top_level'] )
-                $r['reverse_top_level'] = ( 'asc' == get_option('comment_order') ) ? FALSE : TRUE;
+                $r['reverse_top_level'] = ( 'asc' == get_option('comment_order') ) ? false : true;
 
         extract( $r, EXTR_SKIP );