diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:57:18 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-05 11:57:18 +0200 |
| commit | 34fb146ab5c5e5c52541a5c8191043a94bfa0cd1 (patch) | |
| tree | f128434b5609c409deb4c3122dfde729f5526c0a /phpBB/includes/mcp | |
| parent | 4177edf33a010b20c32e908e307ae0729d880af1 (diff) | |
| parent | 05a8baffdbb8bcca05ab927b11f687de99ac7ea9 (diff) | |
| download | forums-34fb146ab5c5e5c52541a5c8191043a94bfa0cd1.tar forums-34fb146ab5c5e5c52541a5c8191043a94bfa0cd1.tar.gz forums-34fb146ab5c5e5c52541a5c8191043a94bfa0cd1.tar.bz2 forums-34fb146ab5c5e5c52541a5c8191043a94bfa0cd1.tar.xz forums-34fb146ab5c5e5c52541a5c8191043a94bfa0cd1.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes/mcp')
| -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 dd7aebdbd1..60ec3b8f5a 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->variable('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>'), |