Return null by default in getModulePartConfig()

This commit is contained in:
Kijin Sung 2020-05-26 08:24:44 +09:00
parent 55cba46f26
commit 55f7898dc9

View file

@ -1390,6 +1390,10 @@ class moduleModel extends module
/**
* @brief Return module configurations
* Global configuration is used to manage board, member and others
*
* @param string $module
* @param int $site_srl @deprecated
* @return object
*/
function getModuleConfig($module, $site_srl = 0)
{
@ -1428,6 +1432,10 @@ class moduleModel extends module
/**
* @brief Return the module configuration of mid
* Manage mid configurations which depend on module
*
* @param string module
* @param int $module_srl
* @return mixed
*/
function getModulePartConfig($module, $module_srl)
{
@ -1448,7 +1456,7 @@ class moduleModel extends module
}
else
{
$config = new stdClass;
$config = -1; // Use -1 as a temporary value because null cannot be cached
}
// Deprecate use of ArrayObject because of https://bugs.php.net/bug.php?id=77298
@ -1466,7 +1474,8 @@ class moduleModel extends module
$GLOBALS['__ModulePartConfig__'][$module][$module_srl] = $config;
}
return $GLOBALS['__ModulePartConfig__'][$module][$module_srl];
$config = $GLOBALS['__ModulePartConfig__'][$module][$module_srl];
return $config === -1 ? null : $config;
}
/**