Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #216504 by webchick et al: added missing table alias in comment_render function.

merge-requests/26/head
Dries Buytaert 2008-04-10 01:45:38 +00:00
parent 2275b8ee02
commit 91824358be
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/comment/comment.module
View File

@ -976,13 +976,13 @@ function comment_render($node, $cid = 0) {
} }
else { else {
// Multiple comment view // 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 = '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); $query_args = array($nid);
if (!user_access('administer comments')) { if (!user_access('administer comments')) {
$query .= ' AND c.status = %d'; $query .= ' AND c.status = %d';
$query_count .= ' AND status = %d'; $query_count .= ' AND c.status = %d';
$query_args[] = COMMENT_PUBLISHED; $query_args[] = COMMENT_PUBLISHED;
} }