Ticket #8755: 8755.patch

wp-includes/comment-template.php

@@ -1284 +1284 @@
         $comment_alt = $comment_thread_alt = 0;
         $comment_depth = 1;
 
-        $defaults = array('walker' => null, 'max_depth' => '', 'style' => 'ul', 'callback' => null, 'end-callback' => null, 'type' => 'all',
-                'page' => '', 'per_page' => '', 'avatar_size' => 32, 'reverse_top_level' => null, 'reverse_children' => '');
+        $defaults = array( 'walker' => null, 'max_depth' => '', 'style' => 'ul', 'callback' => null, 'end-callback' => null, 'type' => 'all',
+                'page' => '', 'per_page' => '', 'avatar_size' => 32, 'reverse_top_level' => null, 'reverse_children' => '', 'default_comments_page' => '' );
 
         $r = wp_parse_args( $args, $defaults );
 
@@ -1335 +1335 @@
                 if ( empty($overridden_cpage) ) {
                         $r['page'] = get_query_var('cpage');
                 } else {
+                        $default_comments_page = ( '' == $r['default_comments_page'] ) ? get_option('default_comments_page') : $r['default_comments_page'];
                         $threaded = ( -1 == $r['max_depth'] ) ? false : true;
-                        $r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
+                        $r['page'] = ( 'newest' == $default_comments_page ) ? get_comment_pages_count( $_comments, $r['per_page'], $threaded ) : 1;
                         set_query_var( 'cpage', $r['page'] );
                 }
         }