fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +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-24 21:29:08 +09:00
commit b419dcf2bc
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1421,13 +1421,20 @@ class moduleModel extends module
} }
else else
{ {
$config = new ArrayObject; if (is_array($output->data->config))
{
$config = array();
}
else
{
$config = new stdClass;
}
} }
// For access to array as properties // Deprecate use of ArrayObject because of https://bugs.php.net/bug.php?id=77298
if($config instanceof ArrayObject) if($config instanceof ArrayObject)
{ {
$config->setFlags(ArrayObject::ARRAY_AS_PROPS); $config = (object)($config->getArrayCopy());
} }
// Set cache // Set cache

4
modules/point/point.controller.php
View file

@ -862,6 +862,10 @@ class pointController extends point
if (!isset(self::$_module_config_cache[$module_srl])) if (!isset(self::$_module_config_cache[$module_srl]))
{ {
self::$_module_config_cache[$module_srl] = ModuleModel::getModulePartConfig('point', $module_srl); self::$_module_config_cache[$module_srl] = ModuleModel::getModulePartConfig('point', $module_srl);
if (is_object(self::$_module_config_cache[$module_srl]))
{
self::$_module_config_cache[$module_srl] = get_object_vars(self::$_module_config_cache[$module_srl]);
}
} }
$module_config = self::$_module_config_cache[$module_srl]; $module_config = self::$_module_config_cache[$module_srl];
} }