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

diff --git a/classes/Notice.php b/classes/Notice.php
index 426065ac90376aa51b53887e9eeebb812c41b6a8..5caecff8f353a392fa42ae9bb0db2fab2790d07c 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -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);