1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-23 17:10:53 +01:00

Merge branch '3.1.x' into 3.2.x

* 3.1.x:
  [ticket/14888] Missing check for disabled profile field types
This commit is contained in:
Tristan Darricau 2016-12-04 10:31:32 +01:00
commit 164a4190d5
No known key found for this signature in database
GPG Key ID: 817043C2E29DB881

View File

@ -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'],