? backup
? cck_strong.patch
? comment_render.patch
? comment_render_0.patch
? drag_and_drop.patch
? emfield-codereview.patch
? legal_locale.patch
? no-op-302638-12.patch
? no-op-302638-6.patch
? page_cache_d6.patch
? path_alias-translation.patch
? sites/all/modules
? sites/default/files
? sites/default/settings.php
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.617.2.3
diff -u -p -r1.617.2.3 comment.module
--- modules/comment/comment.module	17 Sep 2008 06:22:38 -0000	1.617.2.3
+++ modules/comment/comment.module	30 Dec 2008 21:34:11 -0000
@@ -954,7 +954,7 @@ function comment_render($node, $cid = 0)
         $output .= theme('comment_view', $comment, $node, $links);
       }
     }
-    else {
+    elseif ($node->comment_count) {
       // Multiple comment view
       $query_count = 'SELECT COUNT(*) FROM {comments} c WHERE c.nid = %d';
       $query = 'SELECT c.cid as cid, c.pid, c.nid, c.subject, c.comment, c.format, c.timestamp, c.name, c.mail, c.homepage, u.uid, u.name AS registered_name, u.signature, u.picture, u.data, c.thread, c.status FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.nid = %d';