mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/11454] Use set_addresses in other applicable areas

Browse Source 
This should fix some other bugs that may not have yet been recognized--some
areas only set to(), but sent according to user_notify_type, which is not
necessarily email.

PHPBB3-11454
This commit is contained in:
Nathan Guse
2013-04-24 15:34:12 -05:00
parent ebb5169a46
commit fcdfe748b8
10 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/ucp/ucp_resend.php
View File

@@ -91,7 +91,7 @@ class ucp_resend
if ($config['require_activation'] == USER_ACTIVATION_SELF || $coppa)
{
$messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']);
$messenger->to($user_row['user_email'], $user_row['username']);
$messenger->set_addresses($user_row);
$messenger->anti_abuse_headers($config, $user);
@@ -126,8 +126,7 @@ class ucp_resend
while ($row = $db->sql_fetchrow($result))
{
$messenger->template('admin_activate', $row['user_lang']);
$messenger->to($row['user_email'], $row['username']);
$messenger->im($row['user_jabber'], $row['username']);
$messenger->set_addresses($row);
$messenger->anti_abuse_headers($config, $user);