aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/notification/method
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-10-20 18:55:13 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-10-20 18:55:13 -0500
commit0ac9079d1c4e32ae04bb7b5da55fa030279ec9b5 (patch)
tree2acd6d92adfd66176804b27f40360ed84ac68724 /phpBB/includes/notification/method
parenta93067eb4196454c147ea516733182abd1612e84 (diff)
downloadforums-0ac9079d1c4e32ae04bb7b5da55fa030279ec9b5.tar
forums-0ac9079d1c4e32ae04bb7b5da55fa030279ec9b5.tar.gz
forums-0ac9079d1c4e32ae04bb7b5da55fa030279ec9b5.tar.bz2
forums-0ac9079d1c4e32ae04bb7b5da55fa030279ec9b5.tar.xz
forums-0ac9079d1c4e32ae04bb7b5da55fa030279ec9b5.zip
[ticket/11103] Replace $email_template with get_email_template()
PHPBB3-11103
Diffstat (limited to 'phpBB/includes/notification/method')
-rw-r--r--phpBB/includes/notification/method/email.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index e902ea1e85..df7edb13e7 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -78,6 +78,11 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
// Time to go through the queue and send emails
foreach ($this->queue as $notification)
{
+ if ($notification->get_email_template() === false)
+ {
+ continue;
+ }
+
$user = $this->notification_manager->get_user($notification->user_id);
if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users))
@@ -85,7 +90,7 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
continue;
}
- $messenger->template($notification->email_template, $user['user_lang']);
+ $messenger->template($notification->get_email_template(), $user['user_lang']);
$messenger->to($user['user_email'], $user['username']);