aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_groups.php
diff options
context:
space:
mode:
authorRichard McGirr <rmcgirr83@gmail.com>2015-04-19 08:07:45 -0400
committerRMcGirr83 <rmcgirr83@gmail.com>2015-10-13 11:52:52 -0400
commitd003b53922624e7e923ed529726a7f89c3ef5afa (patch)
tree3bb0f33302858b63429e9dd4abc0128d1930c3c8 /phpBB/includes/acp/acp_groups.php
parent1164cc38a243fb2c5b41cc8882956890ff2eecd2 (diff)
downloadforums-d003b53922624e7e923ed529726a7f89c3ef5afa.tar
forums-d003b53922624e7e923ed529726a7f89c3ef5afa.tar.gz
forums-d003b53922624e7e923ed529726a7f89c3ef5afa.tar.bz2
forums-d003b53922624e7e923ed529726a7f89c3ef5afa.tar.xz
forums-d003b53922624e7e923ed529726a7f89c3ef5afa.zip
[ticket/10572] Unguarded includes in acp files
PHPBB3-10572
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
-rw-r--r--phpBB/includes/acp/acp_groups.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index edfada1bf1..befbcdf24a 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -42,7 +42,10 @@ class acp_groups
return;
}
- include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+ if (!function_exists('group_user_attributes'))
+ {
+ include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
+ }
// Check and set some common vars
$action = (isset($_POST['add'])) ? 'add' : ((isset($_POST['addusers'])) ? 'addusers' : request_var('action', ''));
@@ -295,7 +298,10 @@ class acp_groups
case 'edit':
case 'add':
- include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+ if (!function_exists('display_forums'))
+ {
+ include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+ }
$data = $submit_ary = array();