mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-28 16:12:07 +01:00
replacing the concatenation of extra and value array by array_merge, since it crashed in line 535 in some installations
This commit is contained in:
parent
c1647bfcbf
commit
627aa2c228
@ -532,7 +532,7 @@
|
|||||||
$extra = array('**NULL**' => lang('Users choice'));
|
$extra = array('**NULL**' => lang('Users choice'));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if ($extra) $values = $extra + $values;
|
if ($extra) $values = array_merge((array)$extra , (array)$values);
|
||||||
|
|
||||||
$select = $html->select($GLOBALS['type'].'['.$name.']',$default,$values,true);
|
$select = $html->select($GLOBALS['type'].'['.$name.']',$default,$values,true);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user