From 4d4a8f1b8612a4e7b5845fd6c76ebe30911f75d0 Mon Sep 17 00:00:00 2001 From: devjin Date: Wed, 28 Sep 2011 09:03:18 +0000 Subject: [PATCH] fixed theme list git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9404 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/admin/admin.admin.model.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php index f640a5ddd..ea60bfdf2 100644 --- a/modules/admin/admin.admin.model.php +++ b/modules/admin/admin.admin.model.php @@ -157,6 +157,7 @@ $theme_info[$val] = $this->getThemeInfo($val); } } + debugPrint($theme_info); return $theme_info; } @@ -270,8 +271,11 @@ $skins[$module_name] = $skin_info; if ($is_theme){ - if (!$GLOBALS['__ThemeModuleSkin__'][$module_name]) $GLOBALS['__ThemeModuleSkin__'][$module_name] = array(); - $GLOBALS['__ThemeModuleSkin__'][$module_name][$skin_info->name] = $oModuleModel->loadSkinInfo($skin_info->path, '', ''); + if (!$GLOBALS['__ThemeModuleSkin__'][$module_name]){ + $GLOBALS['__ThemeModuleSkin__'][$module_name] = array(); + $GLOBALS['__ThemeModuleSkin__'][$module_name]['skins'] = array(); + } + $GLOBALS['__ThemeModuleSkin__'][$module_name]['skins'][$skin_info->name] = $oModuleModel->loadSkinInfo($skin_info->path, '', ''); } } $theme_info->skin_infos = $skins; @@ -296,12 +300,11 @@ if (is_array($skin_list) && count($skin_list) > 0 && !in_array($val, $exceptionModule)){ if(!$GLOBALS['__ThemeModuleSkin__'][$val]){ + $GLOBALS['__ThemeModuleSkin__'][$val] = array(); $moduleInfo = $oModuleModel->getModuleInfoXml($val); $GLOBALS['__ThemeModuleSkin__'][$val]['title'] = $moduleInfo->title; $GLOBALS['__ThemeModuleSkin__'][$val]['skins'] = array(); } - if(!$GLOBALS['__ThemeModuleSkin__'][$val]['skins']) - $GLOBALS['__ThemeModuleSkin__'][$val]['skins'] = array(); $GLOBALS['__ThemeModuleSkin__'][$val]['skins'] = array_merge($GLOBALS['__ThemeModuleSkin__'][$val]['skins'], $skin_list); } }