aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_messenger.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-11-20 16:35:31 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-11-20 16:35:31 +0100
commit37c766819346b830cf184fdfae9407006a621b17 (patch)
tree5d0e134bf9c2b1b4ccecf574174e4fa9a1628286 /phpBB/includes/functions_messenger.php
parenta7077c91495521a8015a2e1dbbe587b2d97a8edc (diff)
downloadforums-37c766819346b830cf184fdfae9407006a621b17.tar
forums-37c766819346b830cf184fdfae9407006a621b17.tar.gz
forums-37c766819346b830cf184fdfae9407006a621b17.tar.bz2
forums-37c766819346b830cf184fdfae9407006a621b17.tar.xz
forums-37c766819346b830cf184fdfae9407006a621b17.zip
[ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
PHPBB3-10446
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
-rw-r--r--phpBB/includes/functions_messenger.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 9087b1c8aa..91b361183c 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -164,11 +164,14 @@ class messenger
/**
* Adds X-AntiAbuse headers
+ *
+ * @param array $config Configuration array
+ * @param user $user A user object
+ *
+ * @return null
*/
- function anti_abuse_headers()
+ function anti_abuse_headers($config, $user)
{
- global $config, $user;
-
$this->headers('X-AntiAbuse: Board servername - ' . mail_encode($config['server_name']));
$this->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']);
$this->headers('X-AntiAbuse: Username - ' . mail_encode($user->data['username']));