From ca58440582e04af8ee86d05174dbc9da5336b872 Mon Sep 17 00:00:00 2001
From: devjin <namnyams@gmail.com>
Date: Wed, 10 Oct 2012 08:11:55 +0000
Subject: [PATCH] issue 2369 add a layout info to module information.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11652 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/module/module.model.php | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index a72d10a6c..52036a7d0 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -233,8 +233,38 @@
 					$oCacheHandler->put($cache_key,$output);
 				}
 			}
+			else
+			{
+				$moduleInfo = $coutput->data;
+			}
 
 			$moduleInfo->is_layout_fix = ($moduleInfo->layout_srl == -1000) ? 'N' : 'Y';
+			if($moduleInfo->is_layout_fix == 'N' || $moduleInfo->is_skin_fix == 'N')
+			{
+				$designInfoFile = sprintf(_XE_PATH_.'/files/site_design/design_%s.php', $moduleInfo->site_srl);
+				@include($designInfoFile);
+			}
+			
+			if($moduleInfo->is_layout_fix == 'N')
+			{
+				$moduleInfo->layout_srl = $designInfo->layout_srl;
+			}
+
+			if($moduleInfo->is_skin_fix == 'N')
+			{
+				$moduleInfo->skin = $designInfo->module->{$moduleInfo->module}->skin;
+
+				$skinVars = $designInfo->module->{$moduleInfo->module}->skin_vars;
+
+				if($skinVars)
+				{
+					$skinVars = unserialize($skinVars);
+					foreach($skinVars as $key => $val)
+					{
+						$moduleInfo->{$key} = $val;
+					}
+				}
+			}
 
             $moduleInfo = $this->addModuleExtraVars($moduleInfo);