summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorSteven Wittens <steven@10.no-reply.drupal.org>2006-04-04 23:04:58 +0000
committerSteven Wittens <steven@10.no-reply.drupal.org>2006-04-04 23:04:58 +0000
commite1c749fac4d521d845658fa1f63603737c22a8fc (patch)
tree295c7b49300658e8c49b66dece1acc0a97dc4b25 /modules
parent1881ba04c13f99fbfaf4a92e754b676a2664bbc8 (diff)
downloadbrdo-e1c749fac4d521d845658fa1f63603737c22a8fc.tar.gz
brdo-e1c749fac4d521d845658fa1f63603737c22a8fc.tar.bz2
#56930: Custom values fall through on user listing (tenrapid)
Diffstat (limited to 'modules')
-rw-r--r--modules/profile.module8
-rw-r--r--modules/profile/profile.module8
2 files changed, 6 insertions, 10 deletions
diff --git a/modules/profile.module b/modules/profile.module
index ba477cddf..48c8e1aa9 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 ba477cddf..48c8e1aa9 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;
}