From 72b4442af450573e26e9835edbae05fccf938ce8 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sun, 15 Mar 2009 13:50:45 +0000
Subject: #347250 follow-up by yched: Re-order fields load to before the
 general module load.

---
 modules/user/user.module | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules/user/user.module')

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;
-- 
cgit v1.2.3