diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-02-11 08:01:17 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-02-11 08:01:17 +0100 |
| commit | deebd282a7219ba8fbdb706a19e9b248f279080b (patch) | |
| tree | 1c6c13c3fd05d365ba02c2a9c32272adb66d6fe7 /phpBB/includes/mcp/mcp_front.php | |
| parent | 27b07191742417d3b0e3ede32f07ff3de8fe34a0 (diff) | |
| parent | b4672f2665a4425a8d597bb0c80dee8bfbd89ca0 (diff) | |
| download | forums-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_front.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_front.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php index aeb716c1f9..918a98734b 100644 --- a/phpBB/includes/mcp/mcp_front.php +++ b/phpBB/includes/mcp/mcp_front.php @@ -290,7 +290,10 @@ function mcp_front_view($id, $mode, $action) if ($total) { - include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx); + if (!function_exists('get_recipient_strings')) + { + include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx); + } $sql_ary = array( 'SELECT' => 'r.report_id, r.report_time, p.msg_id, p.message_subject, p.message_time, p.to_address, p.bcc_address, p.message_attachment, u.username, u.username_clean, u.user_colour, u.user_id, u2.username as author_name, u2.username_clean as author_name_clean, u2.user_colour as author_colour, u2.user_id as author_id', |