From e07620a0aa689dbb0589427bfb56f9d0be38a283 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 20 Jul 2011 11:42:17 -0400
Subject: [PATCH] change array add to array merge

---
 classes/Notice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index 4ee003c48a..426065ac90 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -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);