diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 23:40:09 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 23:40:09 +0200 |
| commit | f6b4aec9d07e1ea8ebfaf0271b2c0c3ac0364978 (patch) | |
| tree | a0588709aa82d53ce1ee4014ab526d6eb83c84bb /phpBB/includes/functions_profile_fields.php | |
| parent | dad99dcd8e6d186e9283bf66179d630502491b18 (diff) | |
| parent | 60acd63c70eeceff06d913df27a29988692dc7a9 (diff) | |
| download | forums-f6b4aec9d07e1ea8ebfaf0271b2c0c3ac0364978.tar forums-f6b4aec9d07e1ea8ebfaf0271b2c0c3ac0364978.tar.gz forums-f6b4aec9d07e1ea8ebfaf0271b2c0c3ac0364978.tar.bz2 forums-f6b4aec9d07e1ea8ebfaf0271b2c0c3ac0364978.tar.xz forums-f6b4aec9d07e1ea8ebfaf0271b2c0c3ac0364978.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10965] Profile data is only grabbed when show_novalue is enabled
Diffstat (limited to 'phpBB/includes/functions_profile_fields.php')
| -rw-r--r-- | phpBB/includes/functions_profile_fields.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php index 035226713a..10af997bff 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -468,8 +468,11 @@ class custom_profile 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]; + if (!isset($user_fields[$user_id][$used_ident]) && $this->profile_cache[$used_ident]['field_show_novalue']) + { + $user_fields[$user_id][$used_ident]['value'] = ''; + $user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident]; + } } } |