mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-16 21:54:00 +02:00
Code Issues Releases Wiki Activity

[ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().

Browse Source 
PHPBB3-10446
This commit is contained in:
Andreas Fischer
2011-11-20 16:35:31 +01:00
parent a7077c9149
commit 37c7668193
10 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_email.php
View File

@@ -195,7 +195,7 @@ class acp_email
$messenger->template('admin_send_email', $used_lang);
$messenger->anti_abuse_headers();
$messenger->anti_abuse_headers($config, $user);
$messenger->subject(htmlspecialchars_decode($subject));
$messenger->set_mail_priority($priority);

4
phpBB/includes/acp/acp_inactive.php
View File

@@ -118,7 +118,7 @@ class acp_inactive
$messenger->to($row['user_email'], $row['username']);
$messenger->anti_abuse_headers();
$messenger->anti_abuse_headers($config, $user);
$messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($row['username']))
@@ -206,7 +206,7 @@ class acp_inactive
$messenger->to($row['user_email'], $row['username']);
$messenger->im($row['user_jabber'], $row['username']);
$messenger->anti_abuse_headers();
$messenger->anti_abuse_headers($config, $user);
$messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($row['username']),

4
phpBB/includes/acp/acp_users.php
View File

@@ -348,7 +348,7 @@ class acp_users
$messenger->to($user_row['user_email'], $user_row['username']);
$messenger->anti_abuse_headers();
$messenger->anti_abuse_headers($config, $user);
$messenger->assign_vars(array(
'WELCOME_MSG' => htmlspecialchars_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename'])),
@@ -403,7 +403,7 @@ class acp_users
$messenger->to($user_row['user_email'], $user_row['username']);
$messenger->anti_abuse_headers();
$messenger->anti_abuse_headers($config, $user);
$messenger->assign_vars(array(
'USERNAME' => htmlspecialchars_decode($user_row['username']))