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

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-06-17 21:09:41 +09:00
commit 00246165b3
39 changed files with 459 additions and 348 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/file/file.model.php
View file

@ -280,7 +280,8 @@ class fileModel extends file
*/
public static function getFileConfig($module_srl = null)
{
$config = clone ModuleModel::getModuleConfig('file');
$config = ModuleModel::getModuleConfig('file');
$config = is_object($config) ? clone $config : new stdClass();
if($module_srl)
{
$module_config = ModuleModel::getModulePartConfig('file', $module_srl);