From 1d5ac5876bfc1a75ba28fc46b63d0a66cd7c3233 Mon Sep 17 00:00:00 2001
From: Simon Welsh <simon@simon.geek.nz>
Date: Thu, 27 Jun 2013 09:49:10 +1200
Subject: [PATCH] Only redirect on logout if we're not already redirecting

---
 security/Security.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/security/Security.php b/security/Security.php
index 2a4145945..498514d0b 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -346,7 +346,9 @@ class Security extends Controller {
 		$member = Member::currentUser();
 		if($member) $member->logOut();
 
-		if($redirect) $this->redirectBack();
+		if($redirect && (!$this->response || !$this->response->isFinished())) {
+			$this->redirectBack();
+		}
 	}