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

merge sandbox to trunk for 1.4.4.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7944 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-11-30 07:01:36 +00:00
parent 9139515e57
commit f59deeb270
131 changed files with 11605 additions and 4218 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -299,10 +299,15 @@
* @brief 특정 module extend 가져옴
**/
function getModuleExtend($parent_module, $type, $kind='') {
$module_extend_info = $this->loadModuleExtends();
$extend = $module_extend_info[$parent_module.'.'.$kind.'.'.$type];
$key = $parent_module.'.'.$kind.'.'.$type;
return $extend;
$module_extend_info = $this->loadModuleExtends();
if(array_key_exists($key, $module_extend_info))
{
return $module_extend_info[$key];
}
return false;
}
/**
@ -320,11 +325,11 @@
$output = executeQueryArray('module.getModuleExtend');
if($output->data){
foreach($output->data as $v){
$arr[] = sprintf("'%s.%s.%s' => '%s'", $v->parent_module, $v->type, $v->kind, $v->extend_module);
$arr[] = sprintf("'%s.%s.%s' => '%s'", $v->parent_module, $v->kind, $v->type, $v->extend_module);
}
}
$str = '<?PHP $__module_extend_info__=array(%s); return $__module_extend_info__; ?>';
$str = '<?PHP return array(%s); ?>';
$str = sprintf($str, join(',',$arr));
FileHandler::writeFile($cache_file, $str);