aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-08-26 16:54:34 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-08-26 16:54:34 +0200
commit78bfa8c01e1fddfbcef6434961da96acb679ce9f (patch)
tree58eb0b15c18ee33905b81349e3c7eac65bfe3092 /phpBB
parent7893e992ff516eb3eb7355e591a077053e47fb12 (diff)
parent5f81d66c2f666c1825950228e87e7ac6c6b4ca2c (diff)
downloadforums-78bfa8c01e1fddfbcef6434961da96acb679ce9f.tar
forums-78bfa8c01e1fddfbcef6434961da96acb679ce9f.tar.gz
forums-78bfa8c01e1fddfbcef6434961da96acb679ce9f.tar.bz2
forums-78bfa8c01e1fddfbcef6434961da96acb679ce9f.tar.xz
forums-78bfa8c01e1fddfbcef6434961da96acb679ce9f.zip
Merge remote-tracking branch 'bantu/ticket/11799' into develop-olympus
* bantu/ticket/11799: [ticket/11799] Send anti abuse headers in "new password" emails.
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/ucp/ucp_remind.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/includes/ucp/ucp_remind.php
index cb89ad99be..bcb21cbedc 100644
--- a/phpBB/includes/ucp/ucp_remind.php
+++ b/phpBB/includes/ucp/ucp_remind.php
@@ -98,6 +98,8 @@ class ucp_remind
$messenger->to($user_row['user_email'], $user_row['username']);
$messenger->im($user_row['user_jabber'], $user_row['username']);
+ $messenger->anti_abuse_headers($config, $user);
+
$messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($user_row['username']),
'PASSWORD' => htmlspecialchars_decode($user_password),