diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-09-09 14:20:14 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-09-09 14:20:14 -0500 |
| commit | 3624d2c50ac1acca767c5642767102b97fd6b832 (patch) | |
| tree | d57af9c6009967805b3feed0a240f7c7cb0fc752 /phpBB/includes/notifications/method | |
| parent | 74e2a8f893a2e7a69ba129a74dd0b3c31e742e79 (diff) | |
| download | forums-3624d2c50ac1acca767c5642767102b97fd6b832.tar forums-3624d2c50ac1acca767c5642767102b97fd6b832.tar.gz forums-3624d2c50ac1acca767c5642767102b97fd6b832.tar.bz2 forums-3624d2c50ac1acca767c5642767102b97fd6b832.tar.xz forums-3624d2c50ac1acca767c5642767102b97fd6b832.zip | |
[ticket/11103] Use the language system, topic notifications
PHPBB3-11103
Diffstat (limited to 'phpBB/includes/notifications/method')
| -rw-r--r-- | phpBB/includes/notifications/method/email.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php index 69546be73f..d6468c9dc3 100644 --- a/phpBB/includes/notifications/method/email.php +++ b/phpBB/includes/notifications/method/email.php @@ -50,7 +50,7 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base // We do not send emails to banned users if (!function_exists('phpbb_get_banned_user_ids')) { - include($phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $phpbb_container->getParameter('core.php_ext')); + include($this->phpbb_container->getParameter('core.root_path') . 'includes/functions_user.' . $this->phpbb_container->getParameter('core.php_ext')); } $banned_users = phpbb_get_banned_user_ids($user_ids); @@ -68,13 +68,13 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base // Time to go through the queue and send emails foreach ($this->queue as $notification) { - if (in_array($notification->user_id, $banned_users)) + $user = $this->service->get_user($notification->user_id); + + if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users)) { continue; } - $user = $this->service->get_user($notification->user_id); - $messenger->template('notification', $user['user_lang']); $messenger->to($user['user_email'], $user['username']); |