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

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-05-31 23:59:17 +09:00
commit 2c6f1a2b24
12 changed files with 315 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1366,7 +1366,7 @@ class moduleModel extends module
*
* @param string $module
* @param int $site_srl @deprecated
* @return object
* @return mixed
*/
public static function getModuleConfig($module, $site_srl = 0)
{
@ -1387,7 +1387,7 @@ class moduleModel extends module
}
else
{
$config = new stdClass;
$config = -1; // Use -1 as a temporary value because null cannot be cached
}
// Set cache
@ -1399,7 +1399,8 @@ class moduleModel extends module
$GLOBALS['__ModuleConfig__'][$site_srl][$module] = $config;
}
return $GLOBALS['__ModuleConfig__'][$site_srl][$module];
$config = $GLOBALS['__ModuleConfig__'][$site_srl][$module];
return $config === -1 ? null : $config;
}
/**