diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-09-09 10:19:46 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-09-09 10:19:46 -0500 |
| commit | 4b4ea7c5cde7c9f3684ca325c110f81eda593d67 (patch) | |
| tree | 6ab7dbfa564f09da17802c455296823b20de7b4c /phpBB/includes/notifications/method/email.php | |
| parent | 2fb9f2ce6ad44e6dcacc6914379b09d795daace2 (diff) | |
| download | forums-4b4ea7c5cde7c9f3684ca325c110f81eda593d67.tar forums-4b4ea7c5cde7c9f3684ca325c110f81eda593d67.tar.gz forums-4b4ea7c5cde7c9f3684ca325c110f81eda593d67.tar.bz2 forums-4b4ea7c5cde7c9f3684ca325c110f81eda593d67.tar.xz forums-4b4ea7c5cde7c9f3684ca325c110f81eda593d67.zip | |
[ticket/11103] The service now handles all user loading itself
Delete pm notifications when pms are deleted
PHPBB3-11103
Diffstat (limited to 'phpBB/includes/notifications/method/email.php')
| -rw-r--r-- | phpBB/includes/notifications/method/email.php | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php index 2b80b5bf3a..50df9a6c56 100644 --- a/phpBB/includes/notifications/method/email.php +++ b/phpBB/includes/notifications/method/email.php @@ -59,14 +59,8 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base } $banned_users = phpbb_get_banned_user_ids($user_ids); - $sql = 'SELECT * FROM ' . USERS_TABLE . ' - WHERE ' . $this->db->sql_in_set('user_id', $user_ids); - $result = $this->db->sql_query($sql); - while ($row = $this->db->sql_fetchrow($result)) - { - $users[$row['user_id']] = $row; - } - $this->db->sql_freeresult($result); + // Load all the users we need + $this->service->load_users($user_ids); // Load the messenger if (!class_exists('messenger')) @@ -84,9 +78,7 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base continue; } - $notification->users($users); - - $user = $notification->get_user($notification->user_id); + $user = $this->service->get_user($notification->user_id); $messenger->template('privmsg_notify', $user['user_lang']); |