aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2016-12-04 10:31:29 +0100
committerTristan Darricau <github@nicofuma.fr>2016-12-04 10:31:29 +0100
commit533d2b90b8bdb06a75d212c21809ac0ecf79e5b8 (patch)
treee590c6ccc9f8bc3c7a00a361dc105a27e06e9efc /phpBB/includes
parent5505f98aad86767f45ea8c2ad3f31128d0893812 (diff)
parent99a99c54128f6b23399fdd2f563e4f3e19eff254 (diff)
downloadforums-533d2b90b8bdb06a75d212c21809ac0ecf79e5b8.tar
forums-533d2b90b8bdb06a75d212c21809ac0ecf79e5b8.tar.gz
forums-533d2b90b8bdb06a75d212c21809ac0ecf79e5b8.tar.bz2
forums-533d2b90b8bdb06a75d212c21809ac0ecf79e5b8.tar.xz
forums-533d2b90b8bdb06a75d212c21809ac0ecf79e5b8.zip
Merge pull request #4555 from javiexin/ticket/14888
[ticket/14888] Missing check for disabled profile field types * javiexin/ticket/14888: [ticket/14888] Missing check for disabled profile field types
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_profile.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php
index 2012d3c513..9e6cc49522 100644
--- a/phpBB/includes/acp/acp_profile.php
+++ b/phpBB/includes/acp/acp_profile.php
@@ -752,6 +752,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'],