Change ModuleModel::getModuleConfig() to return null if no config exists

This commit is contained in:
Kijin Sung 2020-05-26 19:22:43 +09:00
parent 3f9d406f8d
commit c087121262

View file

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