From ba276fee83acd6327a6e5223614ee2fb79843c04 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Sun, 24 May 2009 23:53:22 +0000
Subject: [PATCH] =?UTF-8?q?r6380=EC=97=90=20=EB=B3=B4=EC=B6=A9=ED=95=98?=
 =?UTF-8?q?=EC=97=AC=20=ED=8F=AC=EC=9B=8C=EB=93=9C=20=EC=95=A1=EC=85=98?=
 =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=B4=EC=84=9C=EB=8F=84=20=EA=B2=80?=
 =?UTF-8?q?=EC=82=AC=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6381 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/module/ModuleObject.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index 9ac56ad43..b9581e645 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -274,7 +274,7 @@
                 if(!$forward) $forward = $oModuleModel->getActionForward($this->act);
 
                 // 찾아진 forward 모듈이 있으면 실행
-                if($forward->module && $forward->type && $forward->act) {
+                if($forward->module && $forward->type && $forward->act && $forward->act == $this->act) {
 
                     $kind = strpos(strtolower($forward->act),'admin')!==false?'admin':'';
 
@@ -287,7 +287,7 @@
 
                     $oModule->setModuleInfo($this->module_info, $xml_info);
 
-                    if(method_exists($oModule, $forward->act)) {
+                    if(isset($xml_info->action->{$forward->act}) && method_exists($oModule, $forward->act)) {
                         $output = $oModule->{$forward->act}();
                     } else {
                         return $this->stop("msg_module_is_not_exists");
@@ -303,6 +303,7 @@
 
                 // forward 모듈을 찾지 못했다면 원 모듈의 default index action을 실행
                 } else if($this->xml_info->default_index_act && method_exists($this, $this->xml_info->default_index_act)) {
+                    Context::set('act',$this->act = $this->xml_info->default_index_act);
                     $output = $this->{$this->xml_info->default_index_act}();
                 } else {
                     return false;