eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

change array add to array merge

Browse Source
This commit is contained in:
Evan Prodromou 2011-07-20 11:42:17 -04:00
parent f726df9748
commit e07620a0aa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Notice.php
View File

@ -275,7 +275,7 @@ class Notice extends Memcached_DataObject
'distribute' => true); 'distribute' => true);
if (!empty($options)) { if (!empty($options)) {
$options = $options + $defaults; $options = array_merge($options, $defaults);
extract($options); extract($options);
} else { } else {
extract($defaults); extract($defaults);