Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
This commit is contained in:
Andreas Fischer 2012-07-23 22:56:57 +02:00
commit dad99dcd8e

View file

@ -455,6 +455,8 @@ class custom_profile
$user_fields = array();
$user_ids = $user_id;
// Go through the fields in correct order
foreach (array_keys($this->profile_cache) as $used_ident)
{
@ -463,6 +465,12 @@ class custom_profile
$user_fields[$user_id][$used_ident]['value'] = $row['pf_' . $used_ident];
$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
}
foreach ($user_ids as $user_id)
{
$user_fields[$user_id][$used_ident]['value'] = '';
$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
}
}
return $user_fields;