From 585e07e1dcd49a21ff44b77017d502f3d7c7808c Mon Sep 17 00:00:00 2001
From: chschy <chschy@gmail.com>
Date: Wed, 16 Nov 2011 06:58:57 +0000
Subject: [PATCH] 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
---
 modules/member/member.controller.php |  3 ++-
 modules/member/member.view.php       | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

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;
         }