summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorGábor Hojtsy <gabor@hojtsy.hu>2007-11-30 09:16:02 +0000
committerGábor Hojtsy <gabor@hojtsy.hu>2007-11-30 09:16:02 +0000
commit333a540f41122649a002d9458142bef26ec9684a (patch)
tree3bffe0814ddf8d67b199816fb04f9f645ea32778 /includes
parentbad47cbf856eb6197efff9b5d23c124d147a0441 (diff)
downloadbrdo-333a540f41122649a002d9458142bef26ec9684a.tar.gz
brdo-333a540f41122649a002d9458142bef26ec9684a.tar.bz2
#137650 by Darren Oh: allow module_invoke_all() to merge multiple arrays recursively
Diffstat (limited to 'includes')
-rw-r--r--includes/module.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/module.inc b/includes/module.inc
index e1c1652f4..64087717a 100644
--- a/includes/module.inc
+++ b/includes/module.inc
@@ -423,7 +423,7 @@ function module_invoke_all() {
$function = $module .'_'. $hook;
$result = call_user_func_array($function, $args);
if (isset($result) && is_array($result)) {
- $return = array_merge($return, $result);
+ $return = array_merge_recursive($return, $result);
}
else if (isset($result)) {
$return[] = $result;