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_inactive.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_inactive.php')
| -rw-r--r-- | phpBB/includes/acp/acp_inactive.php | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 5178fc8006..76c7a1b277 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -34,7 +34,10 @@ class acp_inactive global $config, $db, $user, $auth, $template, $phpbb_container; global $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix; - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + if (!function_exists('user_active_flip')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } $user->add_lang('memberlist'); @@ -109,7 +112,10 @@ class acp_inactive if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !empty($inactive_users)) { - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); + if (!class_exists('messenger')) + { + include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); + } $messenger = new messenger(false); @@ -196,7 +202,10 @@ class acp_inactive if ($row = $db->sql_fetchrow($result)) { // Send the messages - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); + if (!class_exists('messenger')) + { + include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); + } $messenger = new messenger(); $usernames = $user_ids = array(); |