aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_topic.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_topic.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_topic.php')
-rw-r--r--phpBB/includes/mcp/mcp_topic.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 9c63245982..68a65aafdd 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -93,7 +93,11 @@ function mcp_topic_view($id, $mode, $action)
// Restore or pprove posts?
if (($action == 'restore' || $action == 'approve') && $auth->acl_get('m_approve', $topic_info['forum_id']))
{
- include($phpbb_root_path . 'includes/mcp/mcp_queue.' . $phpEx);
+ if (!class_exists('mcp_queue'))
+ {
+ include($phpbb_root_path . 'includes/mcp/mcp_queue.' . $phpEx);
+ }
+
include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);