fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-06 18:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

fixed theme list

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9404 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2011-09-28 09:03:18 +00:00
parent d7e27d38b3
commit 4d4a8f1b86
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/admin/admin.admin.model.php
View file

@ -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);
}
}