From 19151361d3eb7090b70c7c84b0b2dd2ddddd8028 Mon Sep 17 00:00:00 2001 From: devjin Date: Tue, 18 Sep 2012 08:52:35 +0000 Subject: [PATCH] modify logic. git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11304 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/admin/admin.admin.controller.php | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index b7b12e602..f561dc106 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -150,27 +150,27 @@ $buff .= sprintf('$designInfo->layout_srl = %s;', $layoutSrl); } - if($vars->module) + if($designInfo->module) { - if($designInfo->module) + foreach($designInfo->module as $key => $val) { - foreach($designInfo->module as $key => $val) + if($key == $vars->module) { - if($key == $vars->module) - { - $skin = $vars->module_skin; - $skin_vars = serialize($vars->skin_vars); - } - else - { - $skin = $val->skin; - $skin_vars = $val->skin_vars; - } - $buff .= sprintf('$designInfo->module->%s->skin = \'%s\';', $key, $skin); - $buff .= sprintf('$designInfo->module->%s->skin_vars = \'%s\';', $key, $skin_vars); + $skin = $vars->module_skin; + $skin_vars = serialize($vars->skin_vars); } + else + { + $skin = $val->skin; + $skin_vars = $val->skin_vars; + } + $buff .= sprintf('$designInfo->module->%s->skin = \'%s\';', $key, $skin); + $buff .= sprintf('$designInfo->module->%s->skin_vars = \'%s\';', $key, $skin_vars); } - else + } + else + { + if($vars->module) { $buff .= sprintf('$designInfo->module->%s->skin = \'%s\';', $vars->module, $vars->module_skin); $buff .= sprintf('$designInfo->module->%s->skin_vars = \'%s\';', $vars->module, serialize($vars->skin_vars));