? _40563_comments.patch
? modules/devel
? modules/flexinode
? modules/game
? sites/morbus.totalnetnh.net.drupal
Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.403
diff -u -r1.403 comment.module
--- modules/comment.module	8 Dec 2005 09:11:32 -0000	1.403
+++ modules/comment.module	14 Dec 2005 19:44:46 -0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: comment.module,v 1.403 2005-12-08 09:11:32 dries Exp $
+// $Id: comment.module,v 1.403 2005/12/08 09:11:32 dries Exp $
 
 /**
  * @file
@@ -266,12 +266,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.564
diff -u -r1.564 node.module
--- modules/node.module	14 Dec 2005 19:04:27 -0000	1.564
+++ modules/node.module	14 Dec 2005 19:44:46 -0000
@@ -397,6 +397,10 @@
 function node_save(&$node) {
   global $user;
 
+  if (!isset($node->comment)) {
+    $node->comment = variable_get("comment_$node->type", COMMENT_NODE_READ_WRITE);
+  }
+
   $node->is_new = false;
 
   // Apply filters to some default node fields: