From 65fbf4249d4d6d81e0435b360a1b8dfb2cf649f1 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 22 Sep 2009 09:18:09 +0000
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EC=82=AC=EC=9D=B4?=
 =?UTF-8?q?=ED=8A=B8=EC=9D=98=20=EA=B8=B0=EB=B3=B8=20=EB=AA=A8=EB=93=88=20?=
 =?UTF-8?q?=EA=B0=92=EC=9D=B4=20=EC=97=86=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=EA=B3=84=EC=86=8D=ED=95=B4=EC=84=9C=20redirection=ED=95=98?=
 =?UTF-8?q?=EB=8B=A4=20=EB=B8=8C=EB=9D=BC=EC=9A=B0=EC=A0=80=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=A2=85=EB=A3=8C=EB=90=98=EB=8A=94=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
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@6806 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/module/module.model.php        | 3 ++-
 modules/module/queries/getSiteInfo.xml | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index a1c04c876..963eb36ec 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -99,6 +99,7 @@
             if(!$output->data) {
                 $args->site_srl = 0;
                 $output = executeQuery('module.getSiteInfo', $args);
+
                 // 기본 사이트 정보가 없으면 관련된 정보를 갱신
                 if(!$output->data) {
                     // sites 테이블이 없을 경우 생성
@@ -128,7 +129,7 @@
             }
 
             $module_info = $output->data;
-            if(!$module_info->module_srl) return;
+            if(!$module_info->module_srl) return $module_info;
             if(is_array($module_info) && $module_info->data[0]) $module_info = $module_info[0];
             return $this->addModuleExtraVars($module_info);
         }
diff --git a/modules/module/queries/getSiteInfo.xml b/modules/module/queries/getSiteInfo.xml
index c75787318..15c663ea8 100644
--- a/modules/module/queries/getSiteInfo.xml
+++ b/modules/module/queries/getSiteInfo.xml
@@ -1,7 +1,11 @@
 <query id="getSiteInfo" action="select">
     <tables>
-        <table name="sites" />
-        <table name="modules" />
+        <table name="sites" alias="sites" />
+        <table name="modules" alias="modules" type="left join">
+            <conditions>
+                <condition operation="equal" column="modules.module_srl" default="sites.index_module_srl" notnull="notnull" pipe="and" />
+            </conditions>
+        </table>
     </tables>
     <columns>
         <column name="modules.site_srl" alias="module_site_srl" />
@@ -27,6 +31,5 @@
     </columns>
     <conditions>
         <condition operation="equal" column="sites.site_srl" var="site_srl" notnull="notnull" />
-        <condition operation="equal" column="modules.module_srl" default="sites.index_module_srl" notnull="notnull" pipe="and" />
     </conditions>
 </query>