From 1f81d0e2222c0abefac10806b5bd005808e5836b Mon Sep 17 00:00:00 2001
From: Kjartan Mannes <kjartan@2.no-reply.drupal.org>
Date: Mon, 10 Mar 2003 18:13:45 +0000
Subject: [PATCH] - Fixing bug reported by Alastair Maw. My paranoia got a
 little bit too much   apparently.

---
 modules/comment.module         | 3 ++-
 modules/comment/comment.module | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/comment.module b/modules/comment.module
index 1d7ec04a6cd..e74c3468a24 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 1d7ec04a6cd..e74c3468a24 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;
   }