diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-02-18 15:19:57 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-02-18 15:19:57 +0000 |
| commit | ff9e842730ccf251cf8b76401e4df1b1c6edcea2 (patch) | |
| tree | 2b10ab740305648bee997708b6d651a3816e3545 /modules/comment/comment.pages.inc | |
| parent | df591c8f4032041613192e1b7836725f92ea7b10 (diff) | |
| download | brdo-ff9e842730ccf251cf8b76401e4df1b1c6edcea2.tar.gz brdo-ff9e842730ccf251cf8b76401e4df1b1c6edcea2.tar.bz2 | |
#330983 by recidive and boombatower: Rename users/users_roles tables to user/user_role for consistency.
Diffstat (limited to 'modules/comment/comment.pages.inc')
| -rw-r--r-- | modules/comment/comment.pages.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/comment/comment.pages.inc b/modules/comment/comment.pages.inc index dd88ad514..93e93e8b5 100644 --- a/modules/comment/comment.pages.inc +++ b/modules/comment/comment.pages.inc @@ -15,7 +15,7 @@ */ function comment_edit($cid) { global $user; - $comment = db_query('SELECT c.*, u.uid, u.name AS registered_name, u.data FROM {comment} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = :cid', array(':cid'=>$cid) )->fetchObject(); + $comment = db_query('SELECT c.*, u.uid, u.name AS registered_name, u.data FROM {comment} c INNER JOIN {user} u ON c.uid = u.uid WHERE c.cid = :cid', array(':cid'=>$cid) )->fetchObject(); $comment = drupal_unpack($comment); $comment->name = $comment->uid ? $comment->registered_name : $comment->name; @@ -69,7 +69,7 @@ function comment_reply($node, $pid = NULL) { // $pid indicates that this is a reply to a comment. if ($pid) { // Load the comment whose cid = $pid - $comment = db_query('SELECT c.*, u.uid, u.name AS registered_name, u.signature, u.picture, u.data FROM {comment} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = :cid AND c.status = :status', array( + $comment = db_query('SELECT c.*, u.uid, u.name AS registered_name, u.signature, u.picture, u.data FROM {comment} c INNER JOIN {user} u ON c.uid = u.uid WHERE c.cid = :cid AND c.status = :status', array( ':cid'=>$pid, ':status'=>COMMENT_PUBLISHED))->fetchObject(); if ( $comment ) { |