aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_main.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-02-11 08:01:17 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-02-11 08:01:17 +0100
commitdeebd282a7219ba8fbdb706a19e9b248f279080b (patch)
tree1c6c13c3fd05d365ba02c2a9c32272adb66d6fe7 /phpBB/includes/mcp/mcp_main.php
parent27b07191742417d3b0e3ede32f07ff3de8fe34a0 (diff)
parentb4672f2665a4425a8d597bb0c80dee8bfbd89ca0 (diff)
downloadforums-deebd282a7219ba8fbdb706a19e9b248f279080b.tar
forums-deebd282a7219ba8fbdb706a19e9b248f279080b.tar.gz
forums-deebd282a7219ba8fbdb706a19e9b248f279080b.tar.bz2
forums-deebd282a7219ba8fbdb706a19e9b248f279080b.tar.xz
forums-deebd282a7219ba8fbdb706a19e9b248f279080b.zip
Merge pull request #5525 from kasimi/ticket/15954
[ticket/15954] Add safeguards to include() calls
Diffstat (limited to 'phpBB/includes/mcp/mcp_main.php')
-rw-r--r--phpBB/includes/mcp/mcp_main.php20
1 files changed, 16 insertions, 4 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index a4e3a74ba7..733bcccc09 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -174,7 +174,10 @@ class mcp_main
switch ($mode)
{
case 'front':
- include($phpbb_root_path . 'includes/mcp/mcp_front.' . $phpEx);
+ if (!function_exists('mcp_front_view'))
+ {
+ include($phpbb_root_path . 'includes/mcp/mcp_front.' . $phpEx);
+ }
$user->add_lang('acp/common');
@@ -185,7 +188,10 @@ class mcp_main
break;
case 'forum_view':
- include($phpbb_root_path . 'includes/mcp/mcp_forum.' . $phpEx);
+ if (!function_exists('mcp_forum_view'))
+ {
+ include($phpbb_root_path . 'includes/mcp/mcp_forum.' . $phpEx);
+ }
$user->add_lang('viewforum');
@@ -208,7 +214,10 @@ class mcp_main
break;
case 'topic_view':
- include($phpbb_root_path . 'includes/mcp/mcp_topic.' . $phpEx);
+ if (!function_exists('mcp_topic_view'))
+ {
+ include($phpbb_root_path . 'includes/mcp/mcp_topic.' . $phpEx);
+ }
mcp_topic_view($id, $mode, $action);
@@ -217,7 +226,10 @@ class mcp_main
break;
case 'post_details':
- include($phpbb_root_path . 'includes/mcp/mcp_post.' . $phpEx);
+ if (!function_exists('mcp_post_details'))
+ {
+ include($phpbb_root_path . 'includes/mcp/mcp_post.' . $phpEx);
+ }
mcp_post_details($id, $mode, $action);