diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-11-20 18:43:27 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-11-20 18:43:27 +0100 |
| commit | 92e1681761d83db426de1176f48d37ad30c14acf (patch) | |
| tree | 5d0e134bf9c2b1b4ccecf574174e4fa9a1628286 /phpBB/includes/acp/acp_email.php | |
| parent | 615570707109d139b1c85643bee6bf7ad200850b (diff) | |
| parent | 37c766819346b830cf184fdfae9407006a621b17 (diff) | |
| download | forums-92e1681761d83db426de1176f48d37ad30c14acf.tar forums-92e1681761d83db426de1176f48d37ad30c14acf.tar.gz forums-92e1681761d83db426de1176f48d37ad30c14acf.tar.bz2 forums-92e1681761d83db426de1176f48d37ad30c14acf.tar.xz forums-92e1681761d83db426de1176f48d37ad30c14acf.zip | |
Merge remote-tracking branch 'bantu/ticket/10446' into develop-olympus
* bantu/ticket/10446:
[ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
[ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().
[ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.
[ticket/10446] DRY X-AntiAbuse header addition.
Diffstat (limited to 'phpBB/includes/acp/acp_email.php')
| -rw-r--r-- | phpBB/includes/acp/acp_email.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index e98b7a19a5..df0d44c0c5 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -195,10 +195,7 @@ class acp_email $messenger->template('admin_send_email', $used_lang); - $messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']); - $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); - $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); - $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); + $messenger->anti_abuse_headers($config, $user); $messenger->subject(htmlspecialchars_decode($subject)); $messenger->set_mail_priority($priority); |