diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-03-15 13:50:45 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-03-15 13:50:45 +0000 |
| commit | 72b4442af450573e26e9835edbae05fccf938ce8 (patch) | |
| tree | 3d72e11ffe3e16e118c98df0edbd6e2b5f972a05 /modules | |
| parent | 741a2e93429c603ed00e874c0083b91370055863 (diff) | |
| download | brdo-72b4442af450573e26e9835edbae05fccf938ce8.tar.gz brdo-72b4442af450573e26e9835edbae05fccf938ce8.tar.bz2 | |
#347250 follow-up by yched: Re-order fields load to before the general module load.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/user/user.module | 5 |
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; |