summaryrefslogtreecommitdiff
path: root/modules/profile
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2005-12-03 17:12:56 +0000
committerDries Buytaert <dries@buytaert.net>2005-12-03 17:12:56 +0000
commit4b9cd4fcd65372b196dafd2809467bf03515c894 (patch)
tree9e5d8be077cf3257592f59cd78fabdce6719c869 /modules/profile
parentc7bce9efd48e068bc0618afaa7039cabe4b6986d (diff)
downloadbrdo-4b9cd4fcd65372b196dafd2809467bf03515c894.tar.gz
brdo-4b9cd4fcd65372b196dafd2809467bf03515c894.tar.bz2
- Patch #38820 by wtanaka: profile listing carries over people's data on subsequent users.
Diffstat (limited to 'modules/profile')
-rw-r--r--modules/profile/profile.module9
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index 25e14299b..cdb6fa98a 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -90,7 +90,7 @@ function profile_block($op = 'list', $delta = 0, $edit = array()) {
}
if ($fields) {
- _profile_update_user_fields($fields, $account);
+ $fields = _profile_update_user_fields($fields, $account);
$output .= theme('profile_block', $account, $fields, true);
}
@@ -189,7 +189,7 @@ function profile_browse() {
$output = '<div id="profile">';
while ($account = db_fetch_object($result)) {
$account = user_load(array('uid' => $account->uid));
- _profile_update_user_fields($fields, $account);
+ $fields = _profile_update_user_fields($fields, $account);
$output .= theme('profile_listing', $account, $fields);
}
$output .= theme('pager', NULL, 20);
@@ -222,7 +222,7 @@ function profile_browse() {
$output = '<div id="profile">';
while ($account = db_fetch_object($result)) {
$account = user_load(array('uid' => $account->uid));
- _profile_update_user_fields($fields, $account);
+ $fields = _profile_update_user_fields($fields, $account);
$output .= theme('profile_listing', $account, $fields);
}
$output .= '</div>';
@@ -393,12 +393,13 @@ function profile_form_profile($edit, $user, $category) {
/**
* Helper function: update an array of user fields by calling profile_view_field
*/
-function _profile_update_user_fields(&$fields, $account) {
+function _profile_update_user_fields($fields, $account) {
foreach ($fields as $key => $field) {
if ($value = profile_view_field($account, $field)) {
$fields[$key]->value = $value;
}
}
+ return $fields;
}
function profile_validate_profile($edit, $category) {