]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
change array add to array merge
authorEvan Prodromou <evan@status.net>
Wed, 20 Jul 2011 15:42:17 +0000 (11:42 -0400)
committerEvan Prodromou <evan@status.net>
Wed, 20 Jul 2011 15:42:17 +0000 (11:42 -0400)
classes/Notice.php

index 4ee003c48a533fd799abefcd7529f61f593942bb..426065ac90376aa51b53887e9eeebb812c41b6a8 100644 (file)
@@ -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);