From e1c7e3be8b70f41073605503204bc38529c1660b Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 20 Apr 2007 09:40:10 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1262
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/blog/blog.controller.php       |  1 +
 modules/blog/skins/default/layout.html | 11 +++++------
 modules/layout/layout.model.php        |  8 ++++++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/blog/blog.controller.php b/modules/blog/blog.controller.php
index 8ed190a6d..4022da883 100644
--- a/modules/blog/blog.controller.php
+++ b/modules/blog/blog.controller.php
@@ -328,6 +328,7 @@
 
             // serialize하여 저장
             $obj->category_xml_file = sprintf("./files/cache/blog_category/%s.xml.php", $module_srl);
+            $obj->mid = $module_info->mid;
             $skin_vars = serialize($obj);
 
             $oModuleController = &getController('module');
diff --git a/modules/blog/skins/default/layout.html b/modules/blog/skins/default/layout.html
index df42435c4..fccbe0f35 100644
--- a/modules/blog/skins/default/layout.html
+++ b/modules/blog/skins/default/layout.html
@@ -2,7 +2,7 @@
 <!--%import("css/layout.css")-->
 <!-- 블로그 메뉴를 common/js/tree_menu.js를 이용해서 표시 -->
 <script type="text/javascript">
-    loadTreeMenu("./files/cache/blog_category/{$layout_info->layout_srl}.xml.php", "blog_category", "blog_category", "{$layout_info->category_name?$layout_info->category_name:'category'}", "./?mid={$mid}");
+    loadTreeMenu("./files/cache/blog_category/{$layout_info->layout_srl}.xml.php", "blog_category", "blog_category", "{$layout_info->category_name?$layout_info->category_name:'category'}", "./?mid={$layout_info->mid}");
 </script>
 
 <!-- 기본 변수들 세팅 -->
@@ -20,11 +20,11 @@
 
     <div class="layout_logo">
         <!--@if($layout_info->logo_image)-->
-            <a href="./?mid={$mid}"><img src="{$layout_info->logo_image}" border="0" alt="{$layout_info->browser_title}"/></a>
+            <a href="./?mid={$layout_info->mid}"><img src="{$layout_info->logo_image}" border="0" alt="{$layout_info->browser_title}"/></a>
         <!--@end-->
 
         <!--@if($layout_info->top_title)-->
-            <a href="./?mid={$mid}">{$layout_info->top_title}</a>
+            <a href="./?mid={$layout_info->mid}">{$layout_info->top_title}</a>
         <!--@end-->
     </div>
 
@@ -71,10 +71,9 @@
 
                 <div class="layout_admin">
                     <!-- 글쓰기 버튼 -->
-                    <a href="{getUrl('act','dispBlogWrite','document_srl','')}">{$lang->cmd_write}</a> |
-
+                    <a href="{getUrl('mid', $layout_info->mid, 'act','dispBlogWrite','document_srl','')}">{$lang->cmd_write}</a> |
                     <!-- 관리자일 경우 블로그 관리 메뉴 -->
-                    <a href="#" onclick="location.href='{getUrl('act','dispBlogAdminBlogInfo','layout_srl',$layout_info->layout_srl)}';return false;">{$lang->cmd_management}</a>
+                    <a href="#" onclick="location.href='{getUrl('mid', $layout_info->mid, 'act','dispBlogAdminBlogInfo','layout_srl',$layout_info->layout_srl)}';return false;">{$lang->cmd_management}</a>
                 </div>
             <!--@end-->
             
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index 93e40011f..918fb6d78 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -103,6 +103,14 @@
             $cache_file = sprintf('./files/cache/layout/%s.%s.cache.php', $layout, Context::getLangType());
             if(file_exists($cache_file)&&filectime($cache_file)>filectime($xml_file)) {
                 include $cache_file;
+
+                if($layout_info->extra_var) {
+                    foreach($vars as $key => $value) {
+                        if(!$layout_info->extra_var->{$key} && !$layout_info->{$key}) {
+                            $layout_info->{$key} = $value;
+                        }
+                    }
+                }
                 return $layout_info;
             }