diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 22:56:47 +0200 | 
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-23 22:56:47 +0200 | 
| commit | 27d9e3133b4e84b9ddc89aba34967b92ea737dd5 (patch) | |
| tree | 7dc57d12415455f27016e17c3e1cf760f05445ab | |
| parent | 7b98e75ec3ab06d295834d5b48f85ad4b8744742 (diff) | |
| parent | 3c64ccceccbe2174205c86b475fe871f4d5af739 (diff) | |
| download | forums-27d9e3133b4e84b9ddc89aba34967b92ea737dd5.tar forums-27d9e3133b4e84b9ddc89aba34967b92ea737dd5.tar.gz forums-27d9e3133b4e84b9ddc89aba34967b92ea737dd5.tar.bz2 forums-27d9e3133b4e84b9ddc89aba34967b92ea737dd5.tar.xz forums-27d9e3133b4e84b9ddc89aba34967b92ea737dd5.zip  | |
Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
| -rw-r--r-- | phpBB/includes/functions_profile_fields.php | 8 | 
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;  | 
