diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-09-14 18:05:13 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-09-14 18:05:13 -0500 |
| commit | 959c81d00e830e89fa9d583ee93bf8f166013fe0 (patch) | |
| tree | f2eb9147d9b5ca6572b501d72fabdc06395c8fe3 /phpBB/includes/notifications/method | |
| parent | 8e977544fb6763412e45f84791de8c3eccf321c9 (diff) | |
| download | forums-959c81d00e830e89fa9d583ee93bf8f166013fe0.tar forums-959c81d00e830e89fa9d583ee93bf8f166013fe0.tar.gz forums-959c81d00e830e89fa9d583ee93bf8f166013fe0.tar.bz2 forums-959c81d00e830e89fa9d583ee93bf8f166013fe0.tar.xz forums-959c81d00e830e89fa9d583ee93bf8f166013fe0.zip | |
[ticket/11103] Use appropriate email templates to send notifications
Fixing a number of bugs
PHPBB3-11103
Diffstat (limited to 'phpBB/includes/notifications/method')
| -rw-r--r-- | phpBB/includes/notifications/method/email.php | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php index 1bcea13d92..a1ca955ee1 100644 --- a/phpBB/includes/notifications/method/email.php +++ b/phpBB/includes/notifications/method/email.php @@ -82,19 +82,15 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base continue; } - $messenger->template('notification', $user['user_lang']); + $messenger->template($notification->email_template, $user['user_lang']); $messenger->to($user['user_email'], $user['username']); - $messenger->assign_vars(array( - 'USERNAME' => $user['username'], + $messenger->assign_vars(array_merge(array( + 'USERNAME' => $user['username'], - 'MESSAGE' => htmlspecialchars_decode($notification->get_title()), - - 'U_VIEW_MESSAGE' => $notification->get_full_url(), - - 'U_UNSUBSCRIBE' => $notification->get_unsubscribe_url(), - )); + 'U_NOTIFICATION_SETTINGS' => generate_board_url() . '/ucp.' . $this->php_ext . '?i=notifications', // todo Update URL + ), $notification->get_email_template_variables())); $messenger->send($this->notify_method); } |