1 files changed, 2 insertions, 4 deletions
diff --git a/modules/user.module b/modules/user.module
index 34003c959..af3025893 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -41,16 +41,14 @@ function user_load($array = array()) {
 
   $user = db_fetch_object($result);
   $user = drupal_unpack($user);
-  $user->roles = array();
+  user_module_invoke("load", $array, $user);
 
+  $user->roles = array();
   $result = db_query("SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = %d", $user->uid);
-
   while ($role = db_fetch_object($result)) {
     $user->roles[$role->rid] = $role->name;
   }
 
-  user_module_invoke("load", $array, $user);
-
   return $user;
 }