From 80385db75c002a6cb2e507b433dcc98939d5a620 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 20 Mar 2008 12:32:34 +0000 Subject: [PATCH] reverted commit by Klaus, to fix problem reported by Uwe on the German list (options with numeric values (indexes) get renumbered) --- preferences/inc/class.uisettings.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/preferences/inc/class.uisettings.inc.php b/preferences/inc/class.uisettings.inc.php index bbb830f160..52ba7a9a55 100755 --- a/preferences/inc/class.uisettings.inc.php +++ b/preferences/inc/class.uisettings.inc.php @@ -529,7 +529,7 @@ $extra = array('**NULL**' => lang('Users choice')); break; } - if ($extra) $values = array_merge((array)$extra , (array)$values); + if ($extra) $values = $extra + $values; $select = html::select($GLOBALS['type'].'['.$name.']',$default,$values,true); }