Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.648
diff -u -p -r1.648 comment.module
--- modules/comment/comment.module	6 Sep 2008 08:36:19 -0000	1.648
+++ modules/comment/comment.module	15 Sep 2008 12:40:09 -0000
@@ -733,7 +733,9 @@ function comment_save($edit) {
       // Explain the approval queue if necessary, and then
       // redirect the user to the node he's commenting on.
       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.'));
+        if(!user_access('administer comments')) {
+          drupal_set_message(t('Your comment has been queued for moderation by site administrators and will be published after approval.'));
+        }
       }
       else {
         drupal_set_message(t('Your comment has been posted.'));
Index: modules/comment/comment.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v
retrieving revision 1.12
diff -u -p -r1.12 comment.test
--- modules/comment/comment.test	9 Sep 2008 00:29:24 -0000	1.12
+++ modules/comment/comment.test	15 Sep 2008 12:40:09 -0000
@@ -455,6 +455,12 @@ class CommentApprovalTest extends Commen
     $this->drupalLogin($this->admin_user);
     $anonymous_comment4 = $this->getUnapprovedComment($subject);
     $anonymous_comment4 = (object) array('id' => $anonymous_comment4, 'subject' => $subject, 'comment' => $body);
+
+    // Update the node as an administrator, we should not get any "queued for
+    // approval" messages.
+    $this->drupalPost('comment/edit/' . $anonymous_comment4->id, array(), t('Preview'));
+    $this->drupalPost(NULL, array(), t('Save'));
+    $this->assertNoText(t('Your comment has been queued for moderation by site administrators and will be published after approval.'), t("Admins don't get the 'post queued' message when updating an unpublished node."));
     $this->drupalLogout();
 
     $this->assertFalse($this->commentExists($anonymous_comment4), t('Anonymous comment was not published.'));