Merge pull request #123 from tractorcow/pulls/2.0/fix-spam-moderation

BUG Fix "your comment is awaiting moderation" and "your comment is rejected as spam" messages appearing together.

code/controllers/CommentingController.php

@@ -529,11 +529,6 @@ public function doPostComment($data, $form) {
 				$requireModeration = false;
 				break;
 		}
-
-		// we want to show a notification if comments are moderated
-		if ($requireModeration) {
-			Session::set('CommentsModerated', 1);
-		}
 
 		$comment = new Comment();
 		$form->saveInto($comment);
@@ -552,6 +547,11 @@ public function doPostComment($data, $form) {
 			// extend hook to allow extensions. Also see onBeforePostComment
 			$this->extend('onAfterPostComment', $comment);
 		}
+
+		// we want to show a notification if comments are moderated
+		if ($requireModeration && !$comment->IsSpam) {
+			Session::set('CommentsModerated', 1);
+		}
 
 		// clear the users comment since it passed validation
 		Cookie::set('CommentsForm_Comment', false);