extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use array_merge instead of + to avoid losing Europe

Browse Source 
Fixes European timezones were missing in preferences
This commit is contained in:
nathan 2023-01-06 09:21:45 -07:00
parent 323115b041
commit f0c3d819b8
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
preferences/inc/class.preferences_settings.inc.php
View File

@ -505,14 +505,23 @@ class preferences_settings
switch($type)
{
case 'user':
$setting['values'] = array(['value'=>'','label' => lang('Use default')])+$setting['values'];
$setting['values'] = array_merge(
array(['value' => '', 'label' => lang('Use default')]),
$setting['values']
);
break;
case 'default':
case 'group':
$setting['values'] = array(['value'=>'','label' => lang('No default')])+$setting['values'];
$setting['values'] = array_merge(
array(['value' => '', 'label' => lang('No default')]),
$setting['values']
);
break;
case 'forced';
$setting['values'] = array(['value'=> '**NULL**','label' => lang('Users choice')])+$setting['values'];
$setting['values'] = array_merge(
array(['value' => '**NULL**', 'label' => lang('Users choice')]),
$setting['values']
);
break;
}
}