mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 01:13:25 +01:00
Avoid wiping out keys of numeric preference select options with array_merge()
Fixed by changing them from key => value to Et2Select's preferred [key=>string, value=>string] format first. This fixes wrong select option values for many preferences
This commit is contained in:
parent
f332b7bba5
commit
9aea7be231
@ -11,6 +11,7 @@
|
||||
*/
|
||||
|
||||
use EGroupware\Api;
|
||||
use EGroupware\Api\Etemplate\Widget\Select;
|
||||
use EGroupware\Api\Framework;
|
||||
use EGroupware\Api\Egw;
|
||||
use EGroupware\Api\Image;
|
||||
@ -500,6 +501,7 @@ class preferences_settings
|
||||
// move values/options to sel_options array
|
||||
if (isset($setting['values']) && is_array($setting['values']) && !$setting['no_sel_options'])
|
||||
{
|
||||
Select::fix_encoded_options($setting['values'], true);
|
||||
if ($old_type != 'multiselect' && $old_type != 'notify')
|
||||
{
|
||||
switch($type)
|
||||
|
Loading…
Reference in New Issue
Block a user