summaryrefslogtreecommitdiff
path: root/modules/user/user.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user/user.module')
-rw-r--r--modules/user/user.module5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index d63f27cbd..baed78ae9 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -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;