diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 23:39:58 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 23:39:58 +0200 |
| commit | 60acd63c70eeceff06d913df27a29988692dc7a9 (patch) | |
| tree | 6507c413d35cb43c04c0b3862e4a28cd855dd811 /phpBB | |
| parent | 27d9e3133b4e84b9ddc89aba34967b92ea737dd5 (diff) | |
| parent | 9279c8f5ee3d82116cbe61ad542bff1554ffd454 (diff) | |
| download | forums-60acd63c70eeceff06d913df27a29988692dc7a9.tar forums-60acd63c70eeceff06d913df27a29988692dc7a9.tar.gz forums-60acd63c70eeceff06d913df27a29988692dc7a9.tar.bz2 forums-60acd63c70eeceff06d913df27a29988692dc7a9.tar.xz forums-60acd63c70eeceff06d913df27a29988692dc7a9.zip | |
Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
[ticket/10965] Profile data is only grabbed when show_novalue is enabled
Diffstat (limited to 'phpBB')
| -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 8a5571fcce..8573533c2c 100644 --- a/phpBB/includes/functions_profile_fields.php +++ b/phpBB/includes/functions_profile_fields.php @@ -469,8 +469,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]; + } } } |