Prevent infinite redirect and add logout link to sitelock message

This commit is contained in:
Kijin Sung 2016-02-09 11:37:43 +09:00
parent 6db7068245
commit 28095d7b6d
2 changed files with 6 additions and 2 deletions

View file

@ -1435,7 +1435,7 @@ class Context
{
return;
}
elseif (self::get('act') === 'procMemberLogin')
elseif (in_array(self::get('act'), array('procMemberLogin', 'dispMemberLogout')))
{
return;
}
@ -1455,6 +1455,7 @@ class Context
define('_XE_SITELOCK_', TRUE);
define('_XE_SITELOCK_TITLE_', config('lock.title'));
define('_XE_SITELOCK_MESSAGE_', config('lock.message'));
unset($_SESSION['XE_VALIDATOR_RETURN_URL']);
// Load the sitelock template.
if(FileHandler::exists(RX_BASEDIR . 'common/tpl/sitelock.user.html'))