- Patch #20058: move user_module_invoke('load', $array, $user) after loading of roles.

2 files changed, 2 insertions, 2 deletions

diff --git a/modules/user.module b/modules/user.module
index be0490a0f..497aada35 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -66,13 +66,13 @@ function user_load($array = array()) {
   if (db_num_rows($result)) {
     $user = db_fetch_object($result);
     $user = drupal_unpack($user);
-    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);
   }
   else {
     $user = new StdClass();
diff --git a/modules/user/user.module b/modules/user/user.module
index be0490a0f..497aada35 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -66,13 +66,13 @@ function user_load($array = array()) {
   if (db_num_rows($result)) {
     $user = db_fetch_object($result);
     $user = drupal_unpack($user);
-    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);
   }
   else {
     $user = new StdClass();