1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-24 20:17:58 +02:00

Merge branch 'prep-release-3.0.11' into develop-olympus

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

View File

@ -456,6 +456,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)
{
@ -464,6 +466,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;