2 files changed, 6 insertions, 6 deletions
diff --git a/modules/user.module b/modules/user.module
index f61a7e4a7..bc263e428 100644
--- a/modules/user.module
+++ b/modules/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;
 }
 
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;
 }