fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-03 09:14:48 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue2873. fixed a bug. can select a site default skin on member's design setting. member module should not select a site default skin.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12634 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-31 03:03:37 +00:00
parent ca414b44fc
commit 0cbddf117c
1 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

41
modules/module/module.model.php
View file

@ -945,28 +945,37 @@ class moduleModel extends module
} }
$siteInfo = Context::get('site_module_info'); $siteInfo = Context::get('site_module_info');
$oMenuAdminModel = getAdminModel('menu');
if($dir == 'skins') $installedMenuTypes = $oMenuAdminModel->getModuleListInSitemap($siteInfo->site_srl);
$moduleName = $module;
if($moduleName === 'page')
{ {
$type = 'P'; $moduleName = 'ARTICLE';
} }
else if(array_key_exists($moduleName, $installedMenuTypes))
{ {
$type = 'M'; if($dir == 'skins')
} {
$type = 'P';
$defaultSkinName = $this->getModuleDefaultSkin($module, $type, $site_info->site_srl); }
else
if(isset($defaultSkinName)) {
{ $type = 'M';
$defaultSkinInfo = $this->loadSkinInfo($path, $defaultSkinName, $dir); }
$useDefault = new stdClass(); $defaultSkinName = $this->getModuleDefaultSkin($module, $type, $site_info->site_srl);
$useDefault->title = Context::getLang('use_site_default_skin') . ' (' . $defaultSkinInfo->title . ')';
$useDefaultList['/USE_DEFAULT/'] = $useDefault; if(isset($defaultSkinName))
{
$defaultSkinInfo = $this->loadSkinInfo($path, $defaultSkinName, $dir);
$skin_list = array_merge($useDefaultList, $skin_list); $useDefault = new stdClass();
$useDefault->title = Context::getLang('use_site_default_skin') . ' (' . $defaultSkinInfo->title . ')';
$useDefaultList['/USE_DEFAULT/'] = $useDefault;
$skin_list = array_merge($useDefaultList, $skin_list);
}
} }
return $skin_list; return $skin_list;