issue 1026, activated url to redirect after sign in

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9825 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2011-11-16 08:20:52 +00:00
parent 50fc5fe25e
commit 3b9e71ea69

View file

@ -35,7 +35,6 @@
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if($config->after_login_url) $this->setRedirectUrl($config->after_login_url);
// Check change_password_date
$limit_date = $config->change_password_date;
@ -50,7 +49,13 @@
}
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
if(!$config->after_login_url) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
} else {
$returnUrl = $config->after_login_url;
}
$this->setRedirectUrl($returnUrl);
return;
}