Fix strict count() behavior in PHP 7.2

This commit is contained in:
Kijin Sung 2017-12-01 01:42:03 +09:00
parent 6f7f92f3e2
commit 6f35f5bafc
7 changed files with 43 additions and 16 deletions

View file

@ -467,7 +467,7 @@ class moduleModel extends module
foreach($target_module_info as $key => $val)
{
if(!$extra_vars[$val->module_srl] || !count($extra_vars[$val->module_srl])) continue;
if(!$extra_vars[$val->module_srl] || !count(get_object_vars($extra_vars[$val->module_srl]))) continue;
foreach($extra_vars[$val->module_srl] as $k => $v)
{
if($target_module_info[$key]->{$k}) continue;
@ -1828,10 +1828,9 @@ class moduleModel extends module
$args = new stdClass();
$args->module_srl = implode(',', $get_module_srls);
$output = executeQueryArray('module.getModuleExtraVars', $args);
if(!$output->toBool())
{
return;
return array();
}
if(!$output->data)