Index: /Applications/MAMP/htdocs/wordpress-trunk/wp-includes/comment.php
===================================================================
--- /Applications/MAMP/htdocs/wordpress-trunk/wp-includes/comment.php	(revision 18298)
+++ /Applications/MAMP/htdocs/wordpress-trunk/wp-includes/comment.php	(working copy)
@@ -740,6 +740,9 @@
 	if ( empty($comments) )
 		return 0;
 
+	if ( ! get_option('page_comments') )
+		return 1;
+
 	if ( !isset($per_page) )
 		$per_page = (int) get_query_var('comments_per_page');
 	if ( 0 === $per_page )