Commit b1d7222c authored by webchick's avatar webchick
Browse files

#352337 by catch: Avoid pager query if there are no comments on a node.

parent 6cbf7424
...@@ -1078,10 +1078,12 @@ function comment_render($node, $cid = 0) { ...@@ -1078,10 +1078,12 @@ function comment_render($node, $cid = 0) {
$output .= theme('comment_view', $comment, $node, $links); $output .= theme('comment_view', $comment, $node, $links);
} }
} }
// Only attempt to render comments if the node has been commented upon. // Only attempt to render comments if the node has visible comments.
else { // 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. // Multiple comment view.
$query_count = 'SELECT COUNT(*) FROM {comment} c WHERE c.nid = %d'; $query_count = 'SELECT COUNT(*) FROM {comment} c WHERE c.nid = %d';
......
...@@ -124,15 +124,13 @@ function comment_reply($node, $pid = NULL) { ...@@ -124,15 +124,13 @@ function comment_reply($node, $pid = NULL) {
*/ */
function comment_approve($cid) { function comment_approve($cid) {
// Load the comment whose cid = $cid // Load the comment whose cid = $cid
if ($comment = comment_load($cid)) { if ($comment = (array) comment_load($cid)) {
$operations = comment_operations('publish'); $comment['status'] = COMMENT_PUBLISHED;
$query = $operations['publish'][1]; $comment['comment_format'] = $comment['format'];
$query comment_save($comment);
->condition('cid', $cid )
->execute();
drupal_set_message(t('Comment approved.')); drupal_set_message(t('Comment approved.'));
drupal_goto("node/$comment->nid"); drupal_goto('node/' . $comment['nid']);
} }
else { else {
drupal_set_message(t('The comment you are approving does not exist.'), 'error'); drupal_set_message(t('The comment you are approving does not exist.'), 'error');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment