Index: comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.520.2.4
diff -u -p -r1.520.2.4 comment.module
--- comment.module	12 Mar 2007 13:08:36 -0000	1.520.2.4
+++ comment.module	15 Mar 2007 21:14:38 -0000
@@ -953,6 +953,7 @@ function comment_render($node, $cid = 0)
         $query_args[] = COMMENT_PUBLISHED;
       }
 
+      $query = db_rewrite_sql($query, 'c', 'cid', $query_args);
       $result = db_query($query, $query_args);
 
       if ($comment = db_fetch_object($result)) {
@@ -1004,6 +1005,7 @@ function comment_render($node, $cid = 0)
       }
 
       // Start a form, for use with comment control.
+      $query = db_rewrite_sql($query, 'c', 'cid', $query_args);
       $result = pager_query($query, $comments_per_page, 0, $query_count, $query_args);
       if (db_num_rows($result) && (variable_get('comment_controls', COMMENT_CONTROLS_HIDDEN) == COMMENT_CONTROLS_ABOVE || variable_get('comment_controls', COMMENT_CONTROLS_HIDDEN) == COMMENT_CONTROLS_ABOVE_BELOW)) {
         $output .= drupal_get_form('comment_controls', $mode, $order, $comments_per_page);