diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 10:14:15 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-14 10:17:04 +0200 |
| commit | e0fb680dbb46f17a48071745c72b0282aa3a1d93 (patch) | |
| tree | 9a05fbcec5a92950fd326c351aa2e47bbab32c6f /phpBB/includes/acp/acp_email.php | |
| parent | 1d6e1732597fca176353e674c72b2543c77273f3 (diff) | |
| parent | 657216475468051464b25e12160f1749a71c1cf9 (diff) | |
| download | forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.gz forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.bz2 forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.tar.xz forums-e0fb680dbb46f17a48071745c72b0282aa3a1d93.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/10572] Unguarded includes in acp files
Diffstat (limited to 'phpBB/includes/acp/acp_email.php')
| -rw-r--r-- | phpBB/includes/acp/acp_email.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index ebc4a86de3..98c74ff8b3 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -189,8 +189,15 @@ class acp_email $db->sql_freeresult($result); // Send the messages - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx); + if (!class_exists('messenger')) + { + include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); + } + + if (!function_exists('get_group_name')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } $messenger = new messenger($use_queue); $errored = false; |