From e1c749fac4d521d845658fa1f63603737c22a8fc Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Tue, 4 Apr 2006 23:04:58 +0000
Subject: [PATCH] #56930: Custom values fall through on user listing (tenrapid)
---
modules/profile.module | 8 +++-----
modules/profile/profile.module | 8 +++-----
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/modules/profile.module b/modules/profile.module
index ba477cddfb26..48c8e1aa991b 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -447,8 +447,8 @@ function profile_browse() {
$output = '<div id="profile">';
while ($account = db_fetch_object($result)) {
$account = user_load(array('uid' => $account->uid));
- $fields = _profile_update_user_fields($fields, $account);
- $output .= theme('profile_listing', $account, $fields);
+ $profile = _profile_update_user_fields($fields, $account);
+ $output .= theme('profile_listing', $account, $profile);
}
$output .= theme('pager', NULL, 20);
@@ -693,9 +693,7 @@ function profile_form_profile($edit, $user, $category) {
*/
function _profile_update_user_fields($fields, $account) {
foreach ($fields as $key => $field) {
- if ($value = profile_view_field($account, $field)) {
- $fields[$key]->value = $value;
- }
+ $fields[$key]->value = profile_view_field($account, $field);
}
return $fields;
}
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index ba477cddfb26..48c8e1aa991b 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -447,8 +447,8 @@ function profile_browse() {
$output = '<div id="profile">';
while ($account = db_fetch_object($result)) {
$account = user_load(array('uid' => $account->uid));
- $fields = _profile_update_user_fields($fields, $account);
- $output .= theme('profile_listing', $account, $fields);
+ $profile = _profile_update_user_fields($fields, $account);
+ $output .= theme('profile_listing', $account, $profile);
}
$output .= theme('pager', NULL, 20);
@@ -693,9 +693,7 @@ function profile_form_profile($edit, $user, $category) {
*/
function _profile_update_user_fields($fields, $account) {
foreach ($fields as $key => $field) {
- if ($value = profile_view_field($account, $field)) {
- $fields[$key]->value = $value;
- }
+ $fields[$key]->value = profile_view_field($account, $field);
}
return $fields;
}
--
GitLab