diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index b81fc626d..861c5aa31 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -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; } diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 7c2466943..f3eb4c149 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -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; }