--- modules/comment/comment.module.orig 2008-04-23 22:01:49.000000000 +0200 +++ modules/comment/comment.module 2008-04-25 10:01:42.000000000 +0200 @@ -582,7 +582,9 @@ function comment_form_alter(&$form, $for function comment_nodeapi(&$node, $op, $arg = 0) { switch ($op) { case 'load': + if (variable_get('comment_'.$node->type, COMMENT_NODE_READ_WRITE) != COMMENT_NODE_DISABLED) { return db_fetch_array(db_query("SELECT last_comment_timestamp, last_comment_name, comment_count FROM {node_comment_statistics} WHERE nid = %d", $node->nid)); + } break; case 'prepare':