1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 12:14:06 +02:00

Merge branch '3.1.x'

* 3.1.x:
  [ticket/10572] Unguarded includes in acp files
This commit is contained in:
Tristan Darricau
2015-10-14 10:14:15 +02:00
15 changed files with 124 additions and 34 deletions

View File

@@ -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 . '