diff options
author | Dries Buytaert <dries@buytaert.net> | 2005-04-13 18:02:48 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2005-04-13 18:02:48 +0000 |
commit | 1bc5fe183ba71f6ff61bf7baae64b7d6c6b0e1cc (patch) | |
tree | c81e6193d43666e34a0a83df9320175c856dd218 /modules/user | |
parent | 495a03ae9d813cae238560ca5f7634252b3ad46b (diff) | |
download | brdo-1bc5fe183ba71f6ff61bf7baae64b7d6c6b0e1cc.tar.gz brdo-1bc5fe183ba71f6ff61bf7baae64b7d6c6b0e1cc.tar.bz2 |
- Patch #20058: move user_module_invoke('load', $array, $user) after loading of roles.
Diffstat (limited to 'modules/user')
-rw-r--r-- | modules/user/user.module | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |