change array add to array merge

This commit is contained in:
Evan Prodromou 2011-07-20 11:42:17 -04:00
parent f726df9748
commit e07620a0aa
1 changed files with 1 additions and 1 deletions

View File

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