aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_profile_fields.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-07-23 22:56:57 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-07-23 22:56:57 +0200
commitdad99dcd8e6d186e9283bf66179d630502491b18 (patch)
tree1dbcd418d496cf005b0e53219d2b0557c21a1f02 /phpBB/includes/functions_profile_fields.php
parent9480a5e5123518091055ddc8eb1bf137d8243eb0 (diff)
parent27d9e3133b4e84b9ddc89aba34967b92ea737dd5 (diff)
downloadforums-dad99dcd8e6d186e9283bf66179d630502491b18.tar
forums-dad99dcd8e6d186e9283bf66179d630502491b18.tar.gz
forums-dad99dcd8e6d186e9283bf66179d630502491b18.tar.bz2
forums-dad99dcd8e6d186e9283bf66179d630502491b18.tar.xz
forums-dad99dcd8e6d186e9283bf66179d630502491b18.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [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 a0093707a9..035226713a 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -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;