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

reverse order of defaults and options in Notice::saveNew()

Browse Source
This commit is contained in:
Evan Prodromou 2011-07-20 11:53:47 -04:00
parent ebc5d6f676
commit d17a30ada4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/Notice.php
View File

@ -274,8 +274,8 @@ class Notice extends Memcached_DataObject
'scope' => null,
'distribute' => true);
if (!empty($options)) {
$options = array_merge($options, $defaults);
if (!empty($options) && is_array($options)) {
$options = array_merge($defaults, $options);
extract($options);
} else {
extract($defaults);