Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.407
diff -u -r1.407 comment.module
--- modules/comment.module	15 Dec 2005 16:31:01 -0000	1.407
+++ modules/comment.module	16 Dec 2005 13:40:15 -0000
@@ -267,12 +267,6 @@
 
     case 'load':
       return db_fetch_array(db_query("SELECT last_comment_timestamp, last_comment_name, comment_count FROM {node_comment_statistics} WHERE nid = %d", $node->nid));
-    case 'validate':
-      if (!user_access('administer comments')) {
-        // Force default for normal users:
-        $node->comment = variable_get("comment_$node->type", COMMENT_NODE_READ_WRITE);
-      }
-      break;
 
     case 'insert':
       db_query('INSERT INTO {node_comment_statistics} (nid, last_comment_timestamp, last_comment_name, last_comment_uid, comment_count) VALUES (%d, %d, NULL, %d, 0)', $node->nid, $node->created, $node->uid);
Index: modules/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node.module,v
retrieving revision 1.568
diff -u -r1.568 node.module
--- modules/node.module	15 Dec 2005 16:24:40 -0000	1.568
+++ modules/node.module	16 Dec 2005 13:40:17 -0000
@@ -1637,6 +1637,9 @@
   if (!isset($node->revision)) {
     $node->revision = in_array('revision', $node_options);
   }
+  if (!isset($node->comment)) {
+    $node->comment = variable_get("comment_$node->type", COMMENT_NODE_READ_WRITE);
+  }
 
   if (user_access('administer nodes')) {
     // Node author information
@@ -1660,6 +1663,7 @@
     $form['promote']  = array('#type' => 'value', '#value' => $node->promote);
     $form['sticky']   = array('#type' => 'value', '#value' => $node->sticky);
     $form['revision'] = array('#type' => 'value', '#value' => $node->revision);
+    $form['comment']  = array('#type' => 'value', '#value' => $node->comment);
   }
 
   // Add the buttons.