Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

4.7.x
Dries Buytaert 2005-04-13 18:02:48 +00:00
parent 495a03ae9d
commit 1bc5fe183b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/user.module
View File

@ -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();

2
modules/user/user.module
View File

@ -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();