Merge remote-tracking branch 'marc1706/ticket/11488' into develop

* marc1706/ticket/11488:
  [ticket/11488] Use correct base class in email notification method
This commit is contained in:
Andreas Fischer 2013-04-15 13:10:10 -04:00
commit b43ed11470
2 changed files with 2 additions and 2 deletions

View file

@ -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

View file

@ -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']);