fix warning regarding unsupported operand types

This commit is contained in:
Klaus Leithoff 2010-05-11 10:14:34 +00:00
parent 7dfc75f355
commit 3e58c9ae5d
2 changed files with 2 additions and 2 deletions

View File

@ -191,7 +191,7 @@ class infolog_bo
{
$this->status[$key] = array();
}
$this->status[$key] = array_merge($this->status[$key],$config_data['status'][$key]);
$this->status[$key] = array_merge($this->status[$key],(array)$config_data['status'][$key]);
}
}
if (isset($config_data['types']) && is_array($config_data['types']))

View File

@ -442,7 +442,7 @@ class infolog_ui
$rows['sel_options']['info_status'] = array();
foreach($this->bo->status as $typ => $stati)
{
if ($typ != 'defaults') $rows['sel_options']['info_status'] += $stati;
if ($typ != 'defaults' && !empty($stati)) $rows['sel_options']['info_status'] += $stati;
}
}
if ($this->bo->history)