From 71a4d8bf95ffc6e7f4e336a72e9aec151b620fbd Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 23 Feb 2007 05:15:17 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@170
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 classes/module/ModuleHandler.class.php            | 15 ++++++++++-----
 modules/board/board.controller.php                |  2 +-
 modules/board/board.view.php                      |  3 ---
 .../{category.xml => document_category.xml}       |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)
 rename modules/document/schemas/{category.xml => document_category.xml} (93%)

diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 5392367f0..f93068ad8 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -31,21 +31,26 @@
          * 변수를 세팅한다.
          **/
         function ModuleHandler($module = '', $act = '', $mid = '', $document_srl = '') {
+            // act값 설정
+            if(!$act) $this->act = Context::get('act');
+            else $this->act = $act;
+
+            // 설치가 안되어 있다면 install module을 지정
+            if(!Context::isInstalled()) {
+                $this->module = 'install';
+                return;
+            }
+
             // Request Argument중 모듈을 찾을 수 있는 변수를 구함
             if(!$module) $this->module = Context::get('module');
             else $this->module = $module;
 
-            if(!$act) $this->act = Context::get('act');
-            else $this->act = $act;
-
             if(!$mid) $this->mid = Context::get('mid');
             else $this->mid = $mid;
 
             if(!$document_srl) $this->document_srl = Context::get('document_srl');
             else $this->document_srl = $document_srl;
 
-            // 설치가 안되어 있다면 install module을 지정
-            if(!Context::isInstalled()) $this->module = 'install';
         }
 
         /**
diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php
index 47ad0e4f7..8fc4db782 100644
--- a/modules/board/board.controller.php
+++ b/modules/board/board.controller.php
@@ -358,7 +358,7 @@
             $skin = $module_info->skin;
 
             // 스킨의 정보르 구해옴 (extra_vars를 체크하기 위해서)
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
+            $skin_info = $oModuleModel->loadSkinInfo($this->module, $skin);
 
             // 입력받은 변수들을 체크 (mo, act, module_srl, page등 기본적인 변수들 없앰)
             $obj = Context::getRequestVars();
diff --git a/modules/board/board.view.php b/modules/board/board.view.php
index 9d5f920da..fb263e707 100644
--- a/modules/board/board.view.php
+++ b/modules/board/board.view.php
@@ -443,9 +443,6 @@
 
             $oModuleModel = &getModel('module');
             $skin_info = $oModuleModel->loadSkinInfo($this->module, $skin);
-            print "<pre>";
-            print_r($skin_info);
-            print "</pre>";
 
             // skin_info에 extra_vars 값을 지정
             if(count($skin_info->extra_vars)) {
diff --git a/modules/document/schemas/category.xml b/modules/document/schemas/document_category.xml
similarity index 93%
rename from modules/document/schemas/category.xml
rename to modules/document/schemas/document_category.xml
index a201b6c0b..2ff7ef2ab 100644
--- a/modules/document/schemas/category.xml
+++ b/modules/document/schemas/document_category.xml
@@ -1,4 +1,4 @@
-<table name="categories">
+<table name="document_categories">
   <column name="category_srl" type="number" size="11" default="0" notnull="notnull" primary_key="primary_key" />
   <column name="module_srl" type="number" size="11" default="0" notnull="notnull" index="idx_module_srl" />
   <column name="title" type="varchar" size="250" />