forked from GNUsocial/gnu-social
change array add to array merge
This commit is contained in:
parent
f726df9748
commit
e07620a0aa
@ -275,7 +275,7 @@ class Notice extends Memcached_DataObject
|
||||
'distribute' => true);
|
||||
|
||||
if (!empty($options)) {
|
||||
$options = $options + $defaults;
|
||||
$options = array_merge($options, $defaults);
|
||||
extract($options);
|
||||
} else {
|
||||
extract($defaults);
|
||||
|
Loading…
Reference in New Issue
Block a user