diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-12-04 10:31:32 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-12-04 10:31:32 +0100 |
| commit | 164a4190d578d8a9f039a41e1fd6582b60b61db0 (patch) | |
| tree | 337f1970d3034e57fcd391f9bbed6036d3f11a0d /phpBB/includes/acp/acp_profile.php | |
| parent | 17e8726582df3e3115893668c7b1ea39b87028ba (diff) | |
| parent | 533d2b90b8bdb06a75d212c21809ac0ecf79e5b8 (diff) | |
| download | forums-164a4190d578d8a9f039a41e1fd6582b60b61db0.tar forums-164a4190d578d8a9f039a41e1fd6582b60b61db0.tar.gz forums-164a4190d578d8a9f039a41e1fd6582b60b61db0.tar.bz2 forums-164a4190d578d8a9f039a41e1fd6582b60b61db0.tar.xz forums-164a4190d578d8a9f039a41e1fd6582b60b61db0.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14888] Missing check for disabled profile field types
Diffstat (limited to 'phpBB/includes/acp/acp_profile.php')
| -rw-r--r-- | phpBB/includes/acp/acp_profile.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index b09b496bc6..18dde382ca 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -757,6 +757,10 @@ class acp_profile $s_one_need_edit = true; } + if (!isset($this->type_collection[$row['field_type']])) + { + continue; + } $profile_field = $this->type_collection[$row['field_type']]; $template->assign_block_vars('fields', array( 'FIELD_IDENT' => $row['field_ident'], |