Merge branch 'develop' into next

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

View file

@ -1421,13 +1421,20 @@ class moduleModel extends module
}
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)
{
$config->setFlags(ArrayObject::ARRAY_AS_PROPS);
$config = (object)($config->getArrayCopy());
}
// Set cache