We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit e07620a0 authored by Evan Prodromou's avatar Evan Prodromou

change array add to array merge

parent f726df97
......@@ -275,7 +275,7 @@ class Notice extends Memcached_DataObject
'distribute' => true);
if (!empty($options)) {
$options = $options + $defaults;
$options = array_merge($options, $defaults);
} else {
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