From 58445245d9e83758c38f1ddd962868c8cb042545 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 3 Jun 2014 23:20:54 +1200 Subject: [PATCH] Conditionally reset MemberLoginForm.force_message Avoid starting a session just because the login form is rendered, which adds overhead to requests and makes them harder to cache. --- security/MemberLoginForm.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/security/MemberLoginForm.php b/security/MemberLoginForm.php index 3c81f6904..162bd5857 100644 --- a/security/MemberLoginForm.php +++ b/security/MemberLoginForm.php @@ -135,14 +135,20 @@ JS; */ protected function 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( 'Member.LOGGEDINAS', "You're logged in as {name}.", array('name' => $member->{$this->loggedInAsField}) ); } - Session::set('MemberLoginForm.force_message', false); + + // Reset forced message + if($forceMessage) { + Session::set('MemberLoginForm.force_message', false); + } }