From a0526f848514e9c518ee164eebd19f01eca0c822 Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 2 Jul 2007 10:05:20 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1848 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/module/ModuleObject.class.php | 9 ++++++--- classes/xml/XmlJsFilter.class.php | 3 ++- modules/editor/editor.controller.php | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php index 671b36eb2..db58e10f1 100644 --- a/classes/module/ModuleObject.class.php +++ b/classes/module/ModuleObject.class.php @@ -276,7 +276,8 @@ if(!$this->stop_proc) { // 현재 모듈에 act값이 있으면 해당 act를 실행 if(method_exists($this, $this->act)) { - $output = call_user_method($this->act, $this); + //$output = call_user_method($this->act, $this); + $output = call_user_func(array($this, $this->act)); // act가 없으면 action_forward에서 해당하는 act가 있는지 찾아서 대신 실행 } else if(Context::isInstalled()) { @@ -292,14 +293,16 @@ $oModule->init(); $oModule->setModuleInfo($this->module_info, $xml_info); - $output = call_user_method($forward->act, $oModule); + //$output = call_user_method($forward->act, $oModule); + $output = call_user_func(array($oModule, $forward->act)); $this->setTemplatePath($oModule->getTemplatePath()); $this->setTemplateFile($oModule->getTemplateFile()); } else { if($this->xml_info->default_index_act) { - $output = call_user_method($this->xml_info->default_index_act, $this); + //$output = call_user_method($this->xml_info->default_index_act, $this); + $output = call_user_func(array($this, $this->xml_info->default_index_act)); } else { return false; } diff --git a/classes/xml/XmlJsFilter.class.php b/classes/xml/XmlJsFilter.class.php index 57e4cdb72..3ca62cfb9 100644 --- a/classes/xml/XmlJsFilter.class.php +++ b/classes/xml/XmlJsFilter.class.php @@ -103,7 +103,8 @@ // method가 존재하면 실행 if(method_exists($oExtendFilter, $method)) { // 결과를 받음 - $extend_filter_list = call_user_method($method, $oExtendFilter, true); + //$extend_filter_list = call_user_method($method, $oExtendFilter, true); + $extend_filter_list = call_user_func(array($oExtendFilter, $method)); $extend_filter_count = count($extend_filter_list); // 결과에서 lang값을 이용 문서 변수에 적용 diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php index e03e72ce5..151f0ba8d 100644 --- a/modules/editor/editor.controller.php +++ b/modules/editor/editor.controller.php @@ -62,7 +62,8 @@ if(!method_exists($oComponent, $method)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component)); - $output = call_user_method($method, $oComponent); + //$output = call_user_method($method, $oComponent); + $output = call_user_func(array($oComponent, $method)); if((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) return $output; $this->setError($oComponent->getError());