diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-04-15 13:10:10 -0400 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-04-15 13:10:10 -0400 |
| commit | b43ed1147003579337c897c9c40352992589bea5 (patch) | |
| tree | f035f5bb270c9e2504f9469e87ed9d0fb81a362a | |
| parent | bf98122cf494d0a006dbfc37c7814aa52ce9656a (diff) | |
| parent | c1dedabdfb688501dceade55f6f3e96e3495e5dd (diff) | |
| download | forums-b43ed1147003579337c897c9c40352992589bea5.tar forums-b43ed1147003579337c897c9c40352992589bea5.tar.gz forums-b43ed1147003579337c897c9c40352992589bea5.tar.bz2 forums-b43ed1147003579337c897c9c40352992589bea5.tar.xz forums-b43ed1147003579337c897c9c40352992589bea5.zip | |
Merge remote-tracking branch 'marc1706/ticket/11488' into develop
* marc1706/ticket/11488:
[ticket/11488] Use correct base class in email notification method
| -rw-r--r-- | phpBB/includes/notification/method/email.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/notification/method/messenger_base.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php index dc505c0d41..44666b1422 100644 --- a/phpBB/includes/notification/method/email.php +++ b/phpBB/includes/notification/method/email.php @@ -21,7 +21,7 @@ if (!defined('IN_PHPBB')) * * @package notifications */ -class phpbb_notification_method_email extends phpbb_notification_method_base +class phpbb_notification_method_email extends phpbb_notification_method_messenger_base { /** * Get notification method name diff --git a/phpBB/includes/notification/method/messenger_base.php b/phpBB/includes/notification/method/messenger_base.php index ce1ecc09ce..2f9073e80b 100644 --- a/phpBB/includes/notification/method/messenger_base.php +++ b/phpBB/includes/notification/method/messenger_base.php @@ -78,7 +78,7 @@ abstract class phpbb_notification_method_messenger_base extends phpbb_notificati continue; } - $messenger->template($email_template_base_dir . $notification->get_email_template(), $user['user_lang']); + $messenger->template($template_dir_prefix . $notification->get_email_template(), $user['user_lang']); $messenger->to($user['user_email'], $user['username']); |