diff options
| author | Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org> | 2006-02-27 14:15:41 +0000 |
|---|---|---|
| committer | Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org> | 2006-02-27 14:15:41 +0000 |
| commit | 72a73fedbdba3bcd7f47725f5ec98426c1a5f4f5 (patch) | |
| tree | 44ab53cc1befa26a4e9eb712cf9268867e0c2f9e | |
| parent | 68432ae641ff7869711ca9cbae8f0020bc742fd8 (diff) | |
| download | brdo-72a73fedbdba3bcd7f47725f5ec98426c1a5f4f5.tar.gz brdo-72a73fedbdba3bcd7f47725f5ec98426c1a5f4f5.tar.bz2 | |
#51125, _user_forms: change array_merge to array_merge_recursive, patch by wtanaka
| -rw-r--r-- | modules/user.module | 2 | ||||
| -rw-r--r-- | modules/user/user.module | 2 |
2 files changed, 2 insertions, 2 deletions
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'); |