mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-21 23:43:17 +01:00
fix PHP 8 error: Uncaught ArgumentCountError: array_merge() does not accept unknown named parameters
caused by non-numeric keys, spread operator takes care of that automatic
This commit is contained in:
parent
f7af9c3c0f
commit
69f60d100b
@ -325,7 +325,7 @@ class preferences_hooks
|
||||
'type' => 'multiselect',
|
||||
'label' => 'Permanent time zone selection',
|
||||
'name' => 'tz_selection',
|
||||
'values' => $tzs ? call_user_func_array('array_merge',$tzs) : null, // only flat arrays supported
|
||||
'values' => $tzs ? array_merge(...$tzs) : null, // only flat arrays supported
|
||||
'help' => 'Please select timezones, you want to be able to quickly switch between. Switch is NOT shown, if less then two are selected.',
|
||||
'xmlrpc' => True,
|
||||
'admin' => False,
|
||||
|
Loading…
Reference in New Issue
Block a user