Merge branch 'develop' into next

This commit is contained in:
Kijin Sung 2020-06-12 10:28:36 +09:00
commit f01fb9ae42
11 changed files with 41 additions and 22 deletions

View file

@ -499,7 +499,7 @@ class Context
{
$config = Rhymix\Framework\Config::getAll();
}
if (!count($config))
if (!is_array($config) || !count($config))
{
self::$_instance->db_info = self::$_instance->db_info ?: new stdClass;
return;