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

Merge pull request #3184 from silverstripe-iterators/pulls/conditional-force

Browse Source 
Conditionally reset MemberLoginForm.force_message
This commit is contained in:
Damian Mooyman 2014-06-04 08:24:24 +12:00
commit e7014f4cb5
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
security/MemberLoginForm.php
View File

@ -135,14 +135,20 @@ JS;
*/ */
protected function getMessageFromSession() { protected function getMessageFromSession() {
parent::getMessageFromSession(); parent::getMessageFromSession();
if(($member = Member::currentUser()) && !Session::get('MemberLoginForm.force_message')) {
$forceMessage = Session::get('MemberLoginForm.force_message');
if(($member = Member::currentUser()) && !$forceMessage) {
$this->message = _t( $this->message = _t(
'Member.LOGGEDINAS', 'Member.LOGGEDINAS',
"You're logged in as {name}.", "You're logged in as {name}.",
array('name' => $member->{$this->loggedInAsField}) array('name' => $member->{$this->loggedInAsField})
); );
} }
Session::set('MemberLoginForm.force_message', false);
// Reset forced message
if($forceMessage) {
Session::set('MemberLoginForm.force_message', false);
}
} }