summaryrefslogtreecommitdiff
path: root/modules/user/user.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2004-06-28 08:09:30 +0000
committerDries Buytaert <dries@buytaert.net>2004-06-28 08:09:30 +0000
commit2f393aaf318397273a7bed384141c8e8b001399e (patch)
treefb3f8798d286279e87e5d3fd3969c5a1c67206b8 /modules/user/user.module
parent47ef2e21ded230f9fb959e76b698d3ec1380c848 (diff)
downloadbrdo-2f393aaf318397273a7bed384141c8e8b001399e.tar.gz
brdo-2f393aaf318397273a7bed384141c8e8b001399e.tar.bz2
- Fixed glitch in _user_categories(). Reported by Steven Mansour.
Diffstat (limited to 'modules/user/user.module')
-rw-r--r--modules/user/user.module6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index f61a7e4a7..bc263e428 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1648,12 +1648,12 @@ function _user_categories() {
foreach (module_list() as $module) {
if ($data = module_invoke($module, 'user', 'categories')) {
- foreach ($data as $category) {
- $categories[$category['weight']] = $category;
- }
+ $categories = array_merge($data, $categories);
}
}
+ usort($categories, '_user_sort');
+
return $categories;
}