Merge pull request #125 from tractorcow/pulls/2.0/fix-spam-redirection

BUG Fix redirection on moderated & spam comments
silverstripe · May 28, 2015 · bc8f2c1 · bc8f2c1
2 parents 74c14a8 + 2aa8d97
commit bc8f2c1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/code/controllers/CommentingController.php b/code/controllers/CommentingController.php
@@ -566,13 +566,13 @@ public function doPostComment($data, $form) {
 		}
 
 		// Given a redirect page exists, attempt to link to the correct anchor
-		if(!$comment->Moderated) {
+		if($comment->IsSpam) {
+			// Link to the form with the error message contained
+			$hash = $form->FormName();
+		} else if(!$comment->Moderated) {
 			// Display the "awaiting moderation" text
 			$holder = $this->getOption('comments_holder_id');
 			$hash = "{$holder}_PostCommentForm_error";
-		} elseif($comment->IsSpam) {
-			// Link to the form with the error message contained
-			$hash = $form->FormName();
 		} else {
 			// Link to the moderated, non-spam comment
 			$hash = $comment->Permalink();