tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Removed 'Welcome back, FirstName', message that appears if you log-in, out, then in again

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2@65488 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-11-09 23:29:04 +00:00
parent 5f0f9c4801
commit b38253c2e0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
security/MemberLoginForm.php
View File

@ -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;

2
security/Security.php
View File

@ -324,6 +324,8 @@ class Security extends Controller {
"Content" => $content,
));
}
Session::clear('Security.Message');
// custom processing
if(SSViewer::hasTemplate("Security_login")) {