From b1d7222c6b003490dda7f45a92fe80737ba1c129 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Sat, 31 Jan 2009 16:19:29 +0000 Subject: #352337 by catch: Avoid pager query if there are no comments on a node. --- modules/comment/comment.module | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'modules/comment/comment.module') diff --git a/modules/comment/comment.module b/modules/comment/comment.module index a69fba641..4983ca7db 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -1078,10 +1078,12 @@ function comment_render($node, $cid = 0) { $output .= theme('comment_view', $comment, $node, $links); } } - // Only attempt to render comments if the node has been commented upon. - else { + // Only attempt to render comments if the node has visible comments. + // Unpublished comments are not included in $node->comment_count, so show + // comments unconditionally if the user is an administrator. + elseif ($node->comment_count || user_access('administer comments')) { - //TODO Convert to dynamic queries once the pager query is updated to the new DBTNG API. + // TODO: Convert to dynamic queries once the pager query is updated to the new DBTNG API. // Multiple comment view. $query_count = 'SELECT COUNT(*) FROM {comment} c WHERE c.nid = %d'; -- cgit v1.2.3