holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

second attempt to resolve > *Fatal error*: Unsupported operand types in

Browse Source 
> */var/www/egroupware/preferences/inc/class.uisettings.inc.php* on line *532
This commit is contained in:
Klaus Leithoff 2008-04-01 10:27:08 +00:00
parent 1ab52586bd
commit 205e8dbce5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
preferences/inc/class.uisettings.inc.php
View File

@ -529,7 +529,8 @@
$extra = array('**NULL**' => lang('Users choice')); $extra = array('**NULL**' => lang('Users choice'));
break; 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); $select = html::select($GLOBALS['type'].'['.$name.']',$default,$values,true);
} }