diff options
| author | RMcGirr83 <rmcgirr83@gmail.com> | 2017-05-24 12:58:25 -0400 |
|---|---|---|
| committer | RMcGirr83 <rmcgirr83@gmail.com> | 2017-05-24 12:58:25 -0400 |
| commit | 7a3e55bdb3725665b229f47ff6a5778a6f259969 (patch) | |
| tree | aebba203d75a0214ea2287a64ee55fbd5e81022c /phpBB/includes | |
| parent | 03c30d4bc6e6a6d720d3665201885eeee3e23bfc (diff) | |
| download | forums-7a3e55bdb3725665b229f47ff6a5778a6f259969.tar forums-7a3e55bdb3725665b229f47ff6a5778a6f259969.tar.gz forums-7a3e55bdb3725665b229f47ff6a5778a6f259969.tar.bz2 forums-7a3e55bdb3725665b229f47ff6a5778a6f259969.tar.xz forums-7a3e55bdb3725665b229f47ff6a5778a6f259969.zip | |
[ticket/15237] Fix unguarded includes to functions_user
https://tracker.phpbb.com/browse/PHPBB3-15237
PHPBB3-15237
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/mcp/mcp_ban.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_ban.php b/phpBB/includes/mcp/mcp_ban.php index 4d2151fded..2f3405f915 100644 --- a/phpBB/includes/mcp/mcp_ban.php +++ b/phpBB/includes/mcp/mcp_ban.php @@ -28,7 +28,10 @@ class mcp_ban global $db, $user, $auth, $template, $request, $phpbb_dispatcher; global $phpbb_root_path, $phpEx; - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + if (!function_exists('user_ban')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } // Include the admin banning interface... include($phpbb_root_path . 'includes/acp/acp_ban.' . $phpEx); diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index b5f2bf4f02..1cf4a74234 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -53,7 +53,10 @@ function mcp_post_details($id, $mode, $action) if ($auth->acl_get('m_info', $post_info['forum_id'])) { $ip = request_var('ip', ''); - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + if (!function_exists('user_ipwhois')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } $template->assign_vars(array( 'RETURN_POST' => sprintf($user->lang['RETURN_POST'], '<a href="' . append_sid("{$phpbb_root_path}mcp.$phpEx", "i=$id&mode=$mode&p=$post_id") . '">', '</a>'), |