aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-06-17 10:07:03 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-06-17 10:07:03 +0200
commit5de54906f01466159fc956f583de431ae6bfabed (patch)
tree1b39f391894372b297138b4e8377ac0c19736bd1 /phpBB/includes
parent8f3f7d1e5e2342941435cd75bb8c43fd66505360 (diff)
parentcfd4aab7b749e95fa649ee5f6e780c8412b43000 (diff)
downloadforums-5de54906f01466159fc956f583de431ae6bfabed.tar
forums-5de54906f01466159fc956f583de431ae6bfabed.tar.gz
forums-5de54906f01466159fc956f583de431ae6bfabed.tar.bz2
forums-5de54906f01466159fc956f583de431ae6bfabed.tar.xz
forums-5de54906f01466159fc956f583de431ae6bfabed.zip
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_messenger.php7
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 4f0d40031d..f44bcc6fb7 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -181,10 +181,9 @@ class messenger
/**
* Adds X-AntiAbuse headers
*
- * @param array $config Configuration array
- * @param user $user A user object
- *
- * @return null
+ * @param \phpbb\config\config $config Config object
+ * @param \phpbb\user $user User object
+ * @return void
*/
function anti_abuse_headers($config, $user)
{