Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Miscellanious comment module fixes. Patch 20030806.comment-misc.patch by 

Bart Jansens.
4.3.x
Dries Buytaert 2003-08-08 22:57:10 +00:00
parent 39950fe2e2
commit cecaa68e65
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/comment.module
View File

@ -195,7 +195,7 @@ function comment_reply($pid, $nid) {
$comment = db_fetch_object(db_query("SELECT c.*, u.uid, u.name, u.data FROM {comments} c LEFT JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0", $pid)); $comment = db_fetch_object(db_query("SELECT c.*, u.uid, u.name, u.data FROM {comments} c LEFT JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0", $pid));
comment_view($comment); comment_view($comment);
} }
else { else if (user_access("access content")) {
node_view(node_load(array("nid" => $nid))); node_view(node_load(array("nid" => $nid)));
$pid = 0; $pid = 0;
} }
@ -204,10 +204,10 @@ function comment_reply($pid, $nid) {
** If possible, show reply form ** If possible, show reply form
*/ */
if (node_comment_mode($nid) == 1) { if (node_comment_mode($nid) != 2) {
theme("box", t("Reply"), t("This discussion is closed: you can't post new comments.")); theme("box", t("Reply"), t("This discussion is closed: you can't post new comments."));
} }
else if (user_access("post comments", $context)) { else if (user_access("post comments")) {
theme("box", t("Reply"), comment_form(array("pid" => $pid, "nid" => $nid))); theme("box", t("Reply"), comment_form(array("pid" => $pid, "nid" => $nid)));
} }
else { else {

6
modules/comment/comment.module
View File

@ -195,7 +195,7 @@ function comment_reply($pid, $nid) {
$comment = db_fetch_object(db_query("SELECT c.*, u.uid, u.name, u.data FROM {comments} c LEFT JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0", $pid)); $comment = db_fetch_object(db_query("SELECT c.*, u.uid, u.name, u.data FROM {comments} c LEFT JOIN {users} u ON c.uid = u.uid WHERE c.cid = %d AND c.status = 0", $pid));
comment_view($comment); comment_view($comment);
} }
else { else if (user_access("access content")) {
node_view(node_load(array("nid" => $nid))); node_view(node_load(array("nid" => $nid)));
$pid = 0; $pid = 0;
} }
@ -204,10 +204,10 @@ function comment_reply($pid, $nid) {
** If possible, show reply form ** If possible, show reply form
*/ */
if (node_comment_mode($nid) == 1) { if (node_comment_mode($nid) != 2) {
theme("box", t("Reply"), t("This discussion is closed: you can't post new comments.")); theme("box", t("Reply"), t("This discussion is closed: you can't post new comments."));
} }
else if (user_access("post comments", $context)) { else if (user_access("post comments")) {
theme("box", t("Reply"), comment_form(array("pid" => $pid, "nid" => $nid))); theme("box", t("Reply"), comment_form(array("pid" => $pid, "nid" => $nid)));
} }
else { else {