diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-04-24 15:34:12 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-04-24 15:34:12 -0500 |
| commit | fcdfe748b89426ed9d29c9e589fc5b98ed53a797 (patch) | |
| tree | b56e09d514d0c78c3297f8acf06c2f9fe2ecb46c /phpBB/includes/acp | |
| parent | ebb5169a463db9a2e7c552abf87eaf1ac8d086a2 (diff) | |
| download | forums-fcdfe748b89426ed9d29c9e589fc5b98ed53a797.tar forums-fcdfe748b89426ed9d29c9e589fc5b98ed53a797.tar.gz forums-fcdfe748b89426ed9d29c9e589fc5b98ed53a797.tar.bz2 forums-fcdfe748b89426ed9d29c9e589fc5b98ed53a797.tar.xz forums-fcdfe748b89426ed9d29c9e589fc5b98ed53a797.zip | |
[ticket/11454] Use set_addresses in other applicable areas
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
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_inactive.php | 5 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index e61115f681..de4679b58d 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -115,7 +115,7 @@ class acp_inactive { $messenger->template('admin_welcome_activated', $row['user_lang']); - $messenger->to($row['user_email'], $row['username']); + $messenger->set_addresses($row); $messenger->anti_abuse_headers($config, $user); @@ -203,8 +203,7 @@ class acp_inactive { $messenger->template('user_remind_inactive', $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); diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 8f4a22b61f..c8542ddbe7 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -347,7 +347,7 @@ class acp_users $messenger->template($email_template, $user_row['user_lang']); - $messenger->to($user_row['user_email'], $user_row['username']); + $messenger->set_addresses($user_row); $messenger->anti_abuse_headers($config, $user); @@ -402,7 +402,7 @@ class acp_users $messenger->template('admin_welcome_activated', $user_row['user_lang']); - $messenger->to($user_row['user_email'], $user_row['username']); + $messenger->set_addresses($user_row); $messenger->anti_abuse_headers($config, $user); |