Merge branch '3.2.x'

* 3.2.x:
  [ticket/14888] Missing check for disabled profile field types
This commit is contained in:
Tristan Darricau 2016-12-04 10:31:35 +01:00
commit 874f31fc52
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'],