From eee72bfa9509e99be79f9c92e6330bc00ea498dd Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Tue, 13 Jan 2004 19:25:37 +0000 Subject: - Patch 4859: new drupal_unpack() consolidates duplicate code and makes it easy to show avatars next to nodes and comments. Patch by Moshe. As a showcase, maybe Xtemplate should have an option to enable/disable avatars? --- modules/user.module | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'modules/user.module') 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); -- cgit v1.2.3