Commit 72b4442a authored by webchick's avatar webchick

#347250 follow-up by yched: Re-order fields load to before the general module load.

parent 741a2e93
......@@ -267,6 +267,8 @@ function user_load_multiple($uids = array(), $conditions = array(), $reset = FAL
}
}
field_attach_load('user', $queried_users);
// Invoke hook_user_load() on the users loaded from the database
// and add them to the static cache.
foreach (module_implements('user_load') as $module) {
......@@ -274,8 +276,7 @@ function user_load_multiple($uids = array(), $conditions = array(), $reset = FAL
$function($queried_users);
}
// TODO D7 : not sure the 3rd param ($types) is needed.
field_attach_load('user', $queried_users);
$users = $users + $queried_users;
$user_cache = $user_cache + $queried_users;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment