diff options
author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 10:14:15 +0200 |
---|---|---|
committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 10:17:04 +0200 |
commit | e0fb680dbb46f17a48071745c72b0282aa3a1d93 (patch) | |
tree | 9a05fbcec5a92950fd326c351aa2e47bbab32c6f /phpBB/includes/acp/acp_attachments.php | |
parent | 1d6e1732597fca176353e674c72b2543c77273f3 (diff) | |
parent | 657216475468051464b25e12160f1749a71c1cf9 (diff) | |
download | forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.gz forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.bz2 forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.xz forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.zip |
Merge branch '3.1.x'
* 3.1.x:
[ticket/10572] Unguarded includes in acp files
Diffstat (limited to 'phpBB/includes/acp/acp_attachments.php')
-rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index e2090f3cd5..00dd209c6f 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -114,7 +114,10 @@ class acp_attachments { case 'attach': - include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); + if (!function_exists('get_supported_image_types')) + { + include($phpbb_root_path . 'includes/functions_posting.' . $phpEx); + } $sql = 'SELECT group_name, cat_id FROM ' . EXTENSION_GROUPS_TABLE . ' |