From 72a73fedbdba3bcd7f47725f5ec98426c1a5f4f5 Mon Sep 17 00:00:00 2001
From: Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>
Date: Mon, 27 Feb 2006 14:15:41 +0000
Subject: #51125, _user_forms: change array_merge to array_merge_recursive,
 patch by wtanaka

---
 modules/user.module      | 2 +-
 modules/user/user.module | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/user.module b/modules/user.module
index 1601ba02a..57447b48c 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -2029,7 +2029,7 @@ function _user_forms(&$edit, $account, $category, $hook = 'form') {
   $groups = array();
   foreach (module_list() as $module) {
     if ($data = module_invoke($module, 'user', $hook, $edit, $account, $category)) {
-      $groups = array_merge($data, $groups);
+      $groups = array_merge_recursive($data, $groups);
     }
   }
   uasort($groups, '_user_sort');
diff --git a/modules/user/user.module b/modules/user/user.module
index 1601ba02a..57447b48c 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2029,7 +2029,7 @@ function _user_forms(&$edit, $account, $category, $hook = 'form') {
   $groups = array();
   foreach (module_list() as $module) {
     if ($data = module_invoke($module, 'user', $hook, $edit, $account, $category)) {
-      $groups = array_merge($data, $groups);
+      $groups = array_merge_recursive($data, $groups);
     }
   }
   uasort($groups, '_user_sort');
-- 
cgit v1.2.3