Index: drupal/modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.487
diff -u -F^f -r1.487 comment.module
--- drupal/modules/comment/comment.module	9 Sep 2006 00:23:11 -0000	1.487
+++ drupal/modules/comment/comment.module	9 Sep 2006 03:43:21 -0000
@@ -587,13 +587,17 @@ function comment_save($edit) {
 
       if ($edit['cid']) {
         // Update the comment in the database.
+        $edit['status'] = user_access('post comments without approval') ? COMMENT_PUBLISHED : COMMENT_NOT_PUBLISHED;
         db_query("UPDATE {comments} SET status = %d, timestamp = %d, subject = '%s', comment = '%s', format = %d, uid = %d, name = '%s', mail = '%s', homepage = '%s' WHERE cid = %d", $edit['status'], $edit['timestamp'], $edit['subject'], $edit['comment'], $edit['format'], $edit['uid'], $edit['name'], $edit['mail'], $edit['homepage'], $edit['cid']);
 
         _comment_update_node_statistics($edit['nid']);
 
         // Allow modules to respond to the updating of a comment.
         comment_invoke_comment($edit, 'update');
-
+        
+        if ($edit['status'] == COMMENT_NOT_PUBLISHED) {
+          drupal_set_message(t('Your comment has been queued for moderation by site administrators and will be published after approval.'));
+        }
 
         // Add an entry to the watchdog log.
         watchdog('content', t('Comment: updated %subject.', array('%subject' => $edit['subject'])), WATCHDOG_NOTICE, l(t('view'), 'node/'. $edit['nid'], NULL, NULL, 'comment-'. $edit['cid']));