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

issue 2370 fixed install script.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12104 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-11-04 08:45:54 +00:00
parent 69807cf0db
commit 2312f34813
2 changed files with 6 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

28
modules/install/script/ko.install.php
View file

@ -93,32 +93,13 @@
$designInfo->module = new stdClass(); $designInfo->module = new stdClass();
$oModuleModel = &getModel('module');
foreach($skinTypes as $key => $dir) foreach($skinTypes as $key => $dir)
{ {
$skinType = $key == 'skin' ? 'P' : 'M';
foreach($moduleList as $moduleName) foreach($moduleList as $moduleName)
{ {
$moduleSkinPath = ModuleHandler::getModulePath($moduleName).$dir; $designInfo->module->{$moduleName}->{$key} = $oModuleModel->getModuleDefaultSkin($moduleName, $skinType, 0, false);
$skinName = 'default';
$defualtSkinPath = $moduleSkinPath.$skinName;
if(!is_dir($defualtSkinPath))
{
$skins = FileHandler::readDir($moduleSkinPath);
if(count($skins) > 0)
{
$skinName = $skins[0];
}
else
{
$skinName = NULL;
}
}
if($skinName)
{
$designInfo->module->{$moduleName}->{$key} = $skinName;
}
} }
} }
@ -166,9 +147,8 @@
$output = $oDocumentController->insertDocument($obj); $output = $oDocumentController->insertDocument($obj);
if(!$output->toBool()) return $output; if(!$output->toBool()) return $output;
$mdocument_srl = $output->get('document_srl');
// save PageWidget // save PageWidget
$oModuleModel = &getModel('module'); $mdocument_srl = $output->get('document_srl');
$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl); $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
$module_info->document_srl = $document_srl; $module_info->document_srl = $document_srl;
$module_info->mdocument_srl = $mdocument_srl; $module_info->mdocument_srl = $mdocument_srl;

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

@ -1410,7 +1410,7 @@
/** /**
* Get default skin name * Get default skin name
**/ **/
function getModuleDefaultSkin($module_name, $skin_type = 'P', $site_srl = 0) function getModuleDefaultSkin($module_name, $skin_type = 'P', $site_srl = 0, $updateCache = true)
{ {
$target = ($skin_type == 'M') ? 'mskin' : 'skin'; $target = ($skin_type == 'M') ? 'mskin' : 'skin';
@ -1448,7 +1448,7 @@
} }
} }
if($skinName) if($updateCache && $skinName)
{ {
$designInfo->module->{$module_name}->{$target} = $skinName; $designInfo->module->{$module_name}->{$target} = $skinName;