summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2004-12-29 18:41:52 +0000
committerDries Buytaert <dries@buytaert.net>2004-12-29 18:41:52 +0000
commit09c55017f6e1d74fbd5222df622602d14cfc7fdf (patch)
tree7ea7abf88428168fc1616d7fa9a42734d2f12168
parent5049c3e1e464155038824b3dd5ac83daf6fe0ee4 (diff)
downloadbrdo-09c55017f6e1d74fbd5222df622602d14cfc7fdf.tar.gz
brdo-09c55017f6e1d74fbd5222df622602d14cfc7fdf.tar.bz2
- Patch #14882 by Jeremy: removed some cruft: status = 2 is no more.
-rw-r--r--modules/comment.module4
-rw-r--r--modules/comment/comment.module4
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/comment.module b/modules/comment.module
index ac086f445..f0f164a3f 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 ac086f445..f0f164a3f 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);