summaryrefslogtreecommitdiff
path: root/modules/comment/comment.admin.inc
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2009-02-26 07:30:29 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2009-02-26 07:30:29 +0000
commit665c9fdc2ca50f7960c16b375685485b3eb8b1cc (patch)
tree273088dccb033efaf0e7ed718e6041842e32c7ae /modules/comment/comment.admin.inc
parent116de1793300f2aee3d71297c26ec448f8141196 (diff)
downloadbrdo-665c9fdc2ca50f7960c16b375685485b3eb8b1cc.tar.gz
brdo-665c9fdc2ca50f7960c16b375685485b3eb8b1cc.tar.bz2
Roll-back of users -> user table name change in #330983: Broken pgsql is no fun.
Diffstat (limited to 'modules/comment/comment.admin.inc')
-rw-r--r--modules/comment/comment.admin.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/comment/comment.admin.inc b/modules/comment/comment.admin.inc
index 8d88ec77e..d669fe5e7 100644
--- a/modules/comment/comment.admin.inc
+++ b/modules/comment/comment.admin.inc
@@ -67,7 +67,7 @@ function comment_admin_overview($type = 'new', $arg) {
);
$query = db_select('comment', 'c');
- $query->join('user', 'u', 'u.uid = c.uid');
+ $query->join('users', 'u', 'u.uid = c.uid');
$query->join('node', 'n', 'n.nid = c.nid');
$query->addField('u', 'name', 'registered_name');
$query->addField('n', 'title', 'node_title');
@@ -218,7 +218,7 @@ function comment_multiple_delete_confirm_submit($form, &$form_state) {
* The comment to be deleted.
*/
function comment_delete($cid = NULL) {
- $comment = db_fetch_object(db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comment} c INNER JOIN {user} u ON u.uid = c.uid WHERE c.cid = %d', $cid));
+ $comment = db_fetch_object(db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comment} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.cid = %d', $cid));
$comment->name = $comment->uid ? $comment->registered_name : $comment->name;
$output = '';
@@ -285,7 +285,7 @@ function _comment_delete_thread($comment) {
comment_invoke_comment($comment, 'delete');
// Delete the comment's replies.
- $result = db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comment} c INNER JOIN {user} u ON u.uid = c.uid WHERE pid = %d', $comment->cid);
+ $result = db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comment} c INNER JOIN {users} u ON u.uid = c.uid WHERE pid = %d', $comment->cid);
while ($comment = db_fetch_object($result)) {
$comment->name = $comment->uid ? $comment->registered_name : $comment->name;
_comment_delete_thread($comment);