mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-23 20:32:14 +09:00
merge sandbox to trunk for 1.4.3.1
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7659 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
289973781a
commit
200d63636c
195 changed files with 8166 additions and 3576 deletions
|
|
@ -535,9 +535,11 @@
|
|||
$list = FileHandler::readDir($skin_path);
|
||||
if(!count($list)) return;
|
||||
|
||||
natcasesort($list);
|
||||
|
||||
foreach($list as $skin_name) {
|
||||
unset($skin_info);
|
||||
$skin_info = $this->loadSkinInfo($path, $skin_name);
|
||||
$skin_info = $this->loadSkinInfo($path, $skin_name, $dir);
|
||||
if(!$skin_info) $skin_info->title = $skin_name;
|
||||
|
||||
$skin_list[$skin_name] = $skin_info;
|
||||
|
|
@ -1263,7 +1265,7 @@
|
|||
|
||||
function getModuleFileBox($module_filebox_srl){
|
||||
$args->module_filebox_srl = $module_filebox_srl;
|
||||
return executeQuery('getModuleFileBox', $args);
|
||||
return executeQuery('module.getModuleFileBox', $args);
|
||||
}
|
||||
|
||||
function getModuleFileBoxList(){
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue