Ticket #17778: 17778.patch

wp-content/themes/twentyeleven/comments.php

@@ -35 +35 @@
                         ?>
                 </h2>
 
-                <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
+                <?php if ( get_comment_pages_count() > 1 ) : // are there comments to navigate through ?>
                 <nav id="comment-nav-above">
                         <h1 class="assistive-text"><?php _e( 'Comment navigation', 'twentyeleven' ); ?></h1>
                         <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyeleven' ) ); ?></div>
                         <div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyeleven' ) ); ?></div>
                 </nav>
                 <?php endif; // check for comment navigation ?>
-
                 <ol class="commentlist">
                         <?php
                                 /* Loop through and list the comments. Tell wp_list_comments()
@@ -55 +54 @@
                         ?>
                 </ol>
 
-                <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
+                <?php if ( get_comment_pages_count() > 1 ) : // are there comments to navigate through ?>
                 <nav id="comment-nav-below">
                         <h1 class="assistive-text"><?php _e( 'Comment navigation', 'twentyeleven' ); ?></h1>
                         <div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyeleven' ) ); ?></div>

wp-content/themes/twentyten/comments.php

@@ -36 +36 @@
                         number_format_i18n( get_comments_number() ), '<em>' . get_the_title() . '</em>' );
                         ?></h3>
 
-<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
+<?php if ( get_comment_pages_count() > 1 ) : // Are there comments to navigate through? ?>
                         <div class="navigation">
                                 <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'twentyten' ) ); ?></div>
                                 <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>
@@ -55 +55 @@
                                 ?>
                         </ol>
 
-<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
+<?php if ( get_comment_pages_count() > 1 ) : // Are there comments to navigate through? ?>
                         <div class="navigation">
                                 <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'twentyten' ) ); ?></div>
                                 <div class="nav-next"><?php next_comments_link( __( 'Newer Comments <span class="meta-nav">&rarr;</span>', 'twentyten' ) ); ?></div>

wp-includes/comment.php

@@ -731 +731 @@
 function get_comment_pages_count( $comments = null, $per_page = null, $threaded = null ) {
         global $wp_query;
 
-        if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) )
+        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) )
+        if ( !$comments || !is_array( $comments ) )
                 $comments = $wp_query->comments;
 
-        if ( empty($comments) )
+        if ( empty( $comments ) )
                 return 0;
-
-        if ( !isset($per_page) )
-                $per_page = (int) get_query_var('comments_per_page');
+                
+        if ( ! get_option( 'page_comments' ) )
+                return 1;
+        
+        if ( ! isset( $per_page ) )
+                $per_page = (int) get_query_var( 'comments_per_page' );
         if ( 0 === $per_page )
-                $per_page = (int) get_option('comments_per_page');
+                $per_page = (int) get_option( 'comments_per_page' );
         if ( 0 === $per_page )
                 return 1;
 
-        if ( !isset($threaded) )
-                $threaded = get_option('thread_comments');
+        if ( !isset( $threaded ) )
+                $threaded = get_option( 'thread_comments' );
 
         if ( $threaded ) {
                 $walker = new Walker_Comment;