From 1bc5fe183ba71f6ff61bf7baae64b7d6c6b0e1cc Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 13 Apr 2005 18:02:48 +0000
Subject: - Patch #20058: move user_module_invoke('load', $array, $user) after
 loading of roles.

---
 modules/user.module      | 2 +-
 modules/user/user.module | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/user.module b/modules/user.module
index be0490a0f..497aada35 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -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();
diff --git a/modules/user/user.module b/modules/user/user.module
index be0490a0f..497aada35 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -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();
-- 
cgit v1.2.3