issue 1014 added moving url after logout

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9818 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2011-11-16 06:58:57 +00:00
parent 186a6b640c
commit 585e07e1dc
2 changed files with 11 additions and 5 deletions

View file

@ -352,7 +352,8 @@
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member');
if($config->after_logout_url) Context::set('redirect_url', $config->after_logout_url);
if($config->after_logout_url)
$output->redirect_url = $config->after_logout_url;
return $output;
}

View file

@ -66,8 +66,9 @@
unset($member_info->email_host);
if(!$member_info->member_srl) return $this->dispMemberSignUpForm();
Context::set('memberInfo', get_object_vars($member_info));
$memberInfo =get_object_vars($member_info);
Context::set('memberInfo', $memberInfo );
$extendForm = $oMemberModel->getCombineJoinForm($member_info);
unset($extendForm->find_member_account);
@ -310,8 +311,12 @@
**/
function dispMemberLogout() {
$oMemberController = &getController('member');
$oMemberController->procMemberLogout();
$this->setRedirectUrl(getNotEncodedUrl('act', ''));
$output = $oMemberController->procMemberLogout();
if(!$output->redirect_url)
$this->setRedirectUrl(getNotEncodedUrl('act', ''));
else
$this->setRedirectUrl($output->redirect_url);
return;
}