diff options
author | Dries Buytaert <dries@buytaert.net> | 2009-05-21 10:34:55 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2009-05-21 10:34:55 +0000 |
commit | 1c079c3d321d0314396bcc97ff1b672ab841f99e (patch) | |
tree | c376e42f80c00f0b720037e6cf03fdf0736d130b /modules/comment/comment.admin.inc | |
parent | 76ba5ed5165459420fd46919ae35a244c4a0a070 (diff) | |
download | brdo-1c079c3d321d0314396bcc97ff1b672ab841f99e.tar.gz brdo-1c079c3d321d0314396bcc97ff1b672ab841f99e.tar.bz2 |
- Patch #468944 by Berdir: database clean-ups for comment.module.
Diffstat (limited to 'modules/comment/comment.admin.inc')
-rw-r--r-- | modules/comment/comment.admin.inc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/modules/comment/comment.admin.inc b/modules/comment/comment.admin.inc index 156149754..aff9ff17c 100644 --- a/modules/comment/comment.admin.inc +++ b/modules/comment/comment.admin.inc @@ -66,7 +66,7 @@ function comment_admin_overview($type = 'new', $arg) { 'operations' => array('data' => t('Operations')), ); - $query = db_select('comment', 'c'); + $query = db_select('comment', 'c'); $query->join('users', 'u', 'u.uid = c.uid'); $query->join('node', 'n', 'n.nid = c.nid'); $query->addField('u', 'name', 'registered_name'); @@ -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 {users} u ON u.uid = c.uid WHERE c.cid = %d', $cid)); + $comment = 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 = :cid', array(':cid' => $cid))->fetch(); $comment->name = $comment->uid ? $comment->registered_name : $comment->name; $output = ''; @@ -280,13 +280,15 @@ function _comment_delete_thread($comment) { } // Delete the comment. - db_query('DELETE FROM {comment} WHERE cid = %d', $comment->cid); + db_delete('comment') + ->condition('cid', $comment->cid) + ->execute(); watchdog('content', 'Comment: deleted %subject.', array('%subject' => $comment->subject)); 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 {users} u ON u.uid = c.uid WHERE pid = %d', $comment->cid); - while ($comment = db_fetch_object($result)) { + $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 = :cid', array(':cid' => $comment->cid)); + foreach ($result as $comment) { $comment->name = $comment->uid ? $comment->registered_name : $comment->name; _comment_delete_thread($comment); } |