summaryrefslogtreecommitdiff
path: root/modules/user.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user.module')
-rw-r--r--modules/user.module9
1 files changed, 2 insertions, 7 deletions
diff --git a/modules/user.module b/modules/user.module
index bd58e9fa9..82d766e00 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -40,13 +40,8 @@ function user_load($array = array()) {
$result = db_query_range("SELECT u.*, r.name AS role FROM {role} r INNER JOIN {users} u ON r.rid = u.rid WHERE $query u.status < 3", 0, 1);
$user = db_fetch_object($result);
- if ($user->data && $data = unserialize($user->data)) {
- foreach ($data as $key => $value) {
- if (!isset($user->$key)) {
- $user->$key = $value;
- }
- }
- }
+ $user = drupal_unpack($user);
+
user_module_invoke("load", $array, $user);