From 2bc7d85d866d0734bb52d41c442ed5288a8596b8 Mon Sep 17 00:00:00 2001 From: devjin Date: Sat, 3 Nov 2012 09:11:55 +0000 Subject: [PATCH] issue 2653 fixed skin html when used site default skin. git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12069 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/module/module.admin.model.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/module/module.admin.model.php b/modules/module/module.admin.model.php index 19da339e4..bebff3d41 100644 --- a/modules/module/module.admin.model.php +++ b/modules/module/module.admin.model.php @@ -258,11 +258,25 @@ if($mode === 'P') { - $skin = $module_info->skin; + if($module_info->is_skin_fix == 'N') + { + $skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'P', $module_info->site_srl); + } + else + { + $skin = $module_info->skin; + } } else { - $skin = $module_info->mskin; + if($module_info->is_mskin_fix == 'N') + { + $skin = $oModuleModel->getModuleDefaultSkin($module_info->module, 'M', $module_info->site_srl); + } + else + { + $skin = $module_info->mskin; + } } $module_path = './modules/'.$module_info->module;