Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.617
diff -u -p -r1.617 comment.module
--- modules/comment/comment.module	25 Jan 2008 16:19:12 -0000	1.617
+++ modules/comment/comment.module	7 Apr 2008 07:55:12 -0000
@@ -953,13 +953,13 @@ function comment_render($node, $cid = 0)
     }
     else {
       // Multiple comment view
-      $query_count = 'SELECT COUNT(*) FROM {comments} WHERE nid = %d';
+      $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';
 
       $query_args = array($nid);
       if (!user_access('administer comments')) {
         $query .= ' AND c.status = %d';
-        $query_count .= ' AND status = %d';
+        $query_count .= ' AND c.status = %d';
         $query_args[] = COMMENT_PUBLISHED;
       }
 
? sites/all/modules/.DS_Store
? sites/all/modules/.svn
? sites/all/modules/example
? sites/all/modules/exercises
? sites/all/modules/hands-on
? sites/all/modules/inspectschema
? sites/all/modules/presentations
? sites/all/modules/private_comment
? sites/all/modules/privatemsg
? sites/all/modules/coder/coder-theme-cols-240301-1.patch
? sites/all/modules/coder/coder_format-fix-simpletest-fatal-error-222473-2.patch
? sites/all/modules/coder/scripts/coder_format/tests/coder_format-fix-simpletest-fatal-error-222473-2.patch
? sites/all/modules/coder/tests/coder_format.test23