From 69f60d100be119181e5e04a98d79521a9b2ff4a2 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 6 Apr 2021 09:18:23 +0200 Subject: [PATCH] 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 --- preferences/inc/class.preferences_hooks.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preferences/inc/class.preferences_hooks.inc.php b/preferences/inc/class.preferences_hooks.inc.php index 1dbb4884d0..9173fa1aff 100644 --- a/preferences/inc/class.preferences_hooks.inc.php +++ b/preferences/inc/class.preferences_hooks.inc.php @@ -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,