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/ucp/ucp_register.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/ucp/ucp_register.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 13b9945851..4e8729db56 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -155,8 +155,8 @@ class ucp_register $this->tpl_name = 'ucp_agreement'; return; } - - + + // The CAPTCHA kicks in here. We can't help that the information gets lost on language change. if ($config['enable_confirm']) { @@ -366,10 +366,7 @@ class ucp_register $messenger->to($data['email'], $data['username']); - $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->assign_vars(array( 'WELCOME_MSG' => htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])), |