From b38253c2e01920a17b003f357bac741fc1a7cdfa Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Sun, 9 Nov 2008 23:29:04 +0000
Subject: [PATCH] Removed 'Welcome back, FirstName', message that appears if
 you log-in, out, then in again

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@65488 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 security/MemberLoginForm.php | 10 +++++-----
 security/Security.php        |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/security/MemberLoginForm.php b/security/MemberLoginForm.php
index 96e8477d6..908d9845f 100644
--- a/security/MemberLoginForm.php
+++ b/security/MemberLoginForm.php
@@ -104,6 +104,11 @@ class MemberLoginForm extends LoginForm {
 				Session::clear("BackURL");
 				Director::redirect($backURL);
 			} else {
+				Session::set("Security.Message.message", 
+					sprintf(_t('Member.WELCOMEBACK', "Welcome Back, %s"), $firstname)
+				);
+				Session::set("Security.Message.type", "good");
+
 				Director::redirectBack();
 			}
 		} else {
@@ -151,11 +156,6 @@ class MemberLoginForm extends LoginForm {
 	public function performLogin($data) {
 		if($member = MemberAuthenticator::authenticate($data, $this)) {
 			$firstname = Convert::raw2xml($member->FirstName);
-			Session::set("Security.Message.message", 
-				sprintf(_t('Member.WELCOMEBACK', "Welcome Back, %s"), $firstname)
-			);
-			Session::set("Security.Message.type", "good");
-
 			$member->LogIn(isset($data['Remember']));
 			return $member;
 
diff --git a/security/Security.php b/security/Security.php
index 16794b6ed..545c3da79 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -324,6 +324,8 @@ class Security extends Controller {
 				"Content" => $content,
 			));
 		}
+		
+		Session::clear('Security.Message');
 
 		// custom processing
 		if(SSViewer::hasTemplate("Security_login")) {