mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-28 10:53:39 +01:00
fix warning regarding unsupported operand types
This commit is contained in:
parent
7dfc75f355
commit
3e58c9ae5d
@ -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']))
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user