mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-25 08:09:02 +01:00
second attempt to resolve > *Fatal error*: Unsupported operand types in
> */var/www/egroupware/preferences/inc/class.uisettings.inc.php* on line *532
This commit is contained in:
parent
1ab52586bd
commit
205e8dbce5
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user