From 09c55017f6e1d74fbd5222df622602d14cfc7fdf Mon Sep 17 00:00:00 2001 From: Dries Buytaert <dries@buytaert.net> Date: Wed, 29 Dec 2004 18:41:52 +0000 Subject: [PATCH] - Patch #14882 by Jeremy: removed some cruft: status = 2 is no more. --- modules/comment.module | 4 ++-- modules/comment/comment.module | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/comment.module b/modules/comment.module index ac086f445de0..f0f164a3f1be 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -337,7 +337,7 @@ function comment_node_url() { function comment_edit($cid) { global $user; - $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status != 2', $cid)); + $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d', $cid)); $comment = drupal_unpack($comment); $comment->name = $comment->uid ? $comment->registered_name : $comment->name; if (comment_access('edit', $comment)) { @@ -909,7 +909,7 @@ function comment_admin_edit($cid) { } // If we're not saving our changes above, we're editing it. - $result = db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status != 2', $cid); + $result = db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d', $cid); $comment = db_fetch_object($result); $comment->name = $comment->uid ? $comment->registered_name : $comment->name; $comment = drupal_unpack($comment); diff --git a/modules/comment/comment.module b/modules/comment/comment.module index ac086f445de0..f0f164a3f1be 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -337,7 +337,7 @@ function comment_node_url() { function comment_edit($cid) { global $user; - $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status != 2', $cid)); + $comment = db_fetch_object(db_query('SELECT c.*, u.uid, u.name AS registered_name, u.data FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d', $cid)); $comment = drupal_unpack($comment); $comment->name = $comment->uid ? $comment->registered_name : $comment->name; if (comment_access('edit', $comment)) { @@ -909,7 +909,7 @@ function comment_admin_edit($cid) { } // If we're not saving our changes above, we're editing it. - $result = db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status != 2', $cid); + $result = db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d', $cid); $comment = db_fetch_object($result); $comment->name = $comment->uid ? $comment->registered_name : $comment->name; $comment = drupal_unpack($comment); -- GitLab