aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_profile_fields.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-07-23 22:56:36 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-07-23 22:56:36 +0200
commit3c64ccceccbe2174205c86b475fe871f4d5af739 (patch)
tree3fe0b7a95ee07f22eb27a80cb35396846925733e /phpBB/includes/functions_profile_fields.php
parent3da72e98644a7b2bad86c9013e2250304611ce9b (diff)
parent2f5692d4bbdf3e5a39d9a22b83354f5db9638fa8 (diff)
downloadforums-3c64ccceccbe2174205c86b475fe871f4d5af739.tar
forums-3c64ccceccbe2174205c86b475fe871f4d5af739.tar.gz
forums-3c64ccceccbe2174205c86b475fe871f4d5af739.tar.bz2
forums-3c64ccceccbe2174205c86b475fe871f4d5af739.tar.xz
forums-3c64ccceccbe2174205c86b475fe871f4d5af739.zip
Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11
* naderman/ticket/10965: [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
Diffstat (limited to 'phpBB/includes/functions_profile_fields.php')
-rw-r--r--phpBB/includes/functions_profile_fields.php8
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index 5391b781fa..8a5571fcce 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -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;