? comment-wrapper-is-empty-372414-21.patch
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.740
diff -u -p -r1.740 comment.module
--- modules/comment/comment.module	10 Jul 2009 05:50:08 -0000	1.740
+++ modules/comment/comment.module	12 Jul 2009 20:16:03 -0000
@@ -1211,7 +1211,7 @@ function comment_render($node, $cid = 0)
     if (user_access('post comments') && $node->comment == COMMENT_NODE_OPEN && (variable_get('comment_form_location_' . $node->type, COMMENT_FORM_BELOW) == COMMENT_FORM_BELOW) && !$reply) {
       $output .= theme('comment_form_box', array('nid' => $nid), t('Post new comment'));
     }
-    if ($output) {
+    if ($num_rows) {
       $output = theme('comment_wrapper', $output, $node);
     }
   }