makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
* 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
commit 27d9e3133b
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/functions_profile_fields.php
View file

@ -456,6 +456,8 @@ class custom_profile
$user_fields = array(); $user_fields = array();
$user_ids = $user_id;
// Go through the fields in correct order // Go through the fields in correct order
foreach (array_keys($this->profile_cache) as $used_ident) 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]['value'] = $row['pf_' . $used_ident];
$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$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; return $user_fields;