summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/comment.module3
-rw-r--r--modules/comment/comment.module3
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/comment.module b/modules/comment.module
index 1d7ec04a6..e74c3468a 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -1503,7 +1503,8 @@ function comment_nodeapi(&$node, $op, $arg = 0) {
break;
case "validate":
if (!user_access("administer nodes")) {
- unset($node->comment);
+ // Force default for normal users:
+ $node->comment = variable_get("comment_$node->type", 2);
}
break;
}
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 1d7ec04a6..e74c3468a 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1503,7 +1503,8 @@ function comment_nodeapi(&$node, $op, $arg = 0) {
break;
case "validate":
if (!user_access("administer nodes")) {
- unset($node->comment);
+ // Force default for normal users:
+ $node->comment = variable_get("comment_$node->type", 2);
}
break;
}