forked from extern/egroupware
avoid fatal error on merging prefs
This commit is contained in:
parent
1a16869651
commit
3d705be6e7
@ -421,7 +421,7 @@ class Preferences
|
|||||||
default:
|
default:
|
||||||
foreach($values as $app => $vals)
|
foreach($values as $app => $vals)
|
||||||
{
|
{
|
||||||
$this->group[$app] = $vals + (array)$this->group[$app];
|
$this->group[$app] = (array)$vals + (array)$this->group[$app];
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user