From d17a30ada4216205bb9b6673f63afbc75fcfe830 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 20 Jul 2011 11:53:47 -0400
Subject: [PATCH] reverse order of defaults and options in Notice::saveNew()

---
 classes/Notice.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index 426065ac90..5caecff8f3 100644
--- 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);