git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit d17a30ad authored by Evan Prodromou's avatar Evan Prodromou

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

parent ebc5d6f6
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment