From 205e8dbce5af809bb32b1e0fee662d82171b2b35 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Tue, 1 Apr 2008 10:27:08 +0000 Subject: [PATCH] second attempt to resolve > *Fatal error*: Unsupported operand types in > */var/www/egroupware/preferences/inc/class.uisettings.inc.php* on line *532 --- preferences/inc/class.uisettings.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/preferences/inc/class.uisettings.inc.php b/preferences/inc/class.uisettings.inc.php index 52ba7a9a55..6f9c818a9f 100755 --- a/preferences/inc/class.uisettings.inc.php +++ b/preferences/inc/class.uisettings.inc.php @@ -529,7 +529,8 @@ $extra = array('**NULL**' => lang('Users choice')); break; } - if ($extra) $values = $extra + $values; + #if ($extra) $values = $extra + $values; + if (is_array($extra)) $values = $extra + (is_array($values)?$values:array($values)); $select = html::select($GLOBALS['type'].'['.$name.']',$default,$values,true); }