diff options
| author | Richard McGirr <rmcgirr83@gmail.com> | 2015-04-19 08:07:45 -0400 |
|---|---|---|
| committer | RMcGirr83 <rmcgirr83@gmail.com> | 2015-10-13 11:52:52 -0400 |
| commit | d003b53922624e7e923ed529726a7f89c3ef5afa (patch) | |
| tree | 3bb0f33302858b63429e9dd4abc0128d1930c3c8 /phpBB/includes/acp/acp_permissions.php | |
| parent | 1164cc38a243fb2c5b41cc8882956890ff2eecd2 (diff) | |
| download | forums-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_permissions.php')
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index cb408e304f..660afb4e93 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -30,8 +30,15 @@ class acp_permissions global $db, $user, $auth, $template, $cache, $phpbb_container; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; - include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx); - include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx); + if (!function_exists('user_get_id_name')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } + + if (!class_exists('auth_admin')) + { + include($phpbb_root_path . 'includes/acp/auth.' . $phpEx); + } $this->permissions = $phpbb_container->get('acl.permissions'); |