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);