mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-12 02:25:18 +02:00
Code Issues Releases Wiki Activity

[ticket/11103] Make jabber use short/ email template files

Browse Source 
PHPBB3-11103
This commit is contained in:
Nathaniel Guse 2012-11-11 11:41:18 -06:00
parent 985d234a29
commit 7948aaa78e
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/includes/notification/method/email.php
View File

@ -40,6 +40,13 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
*/ */
protected $notify_method = NOTIFY_EMAIL; protected $notify_method = NOTIFY_EMAIL;
/**
* Base directory to prepend to the email template name
*
* @var string
*/
protected $email_template_base_dir = '';
/** /**
* Is this method available for the user? * Is this method available for the user?
* This is checked on the notifications options * This is checked on the notifications options
@ -100,7 +107,7 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
continue; continue;
} }
$messenger->template($notification->get_email_template(), $user['user_lang']); $messenger->template($this->email_template_base_dir . $notification->get_email_template(), $user['user_lang']);
$messenger->to($user['user_email'], $user['username']); $messenger->to($user['user_email'], $user['username']);

7
phpBB/includes/notification/method/jabber.php
View File

@ -40,6 +40,13 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
*/ */
protected $notify_method = NOTIFY_IM; protected $notify_method = NOTIFY_IM;
/**
* Base directory to prepend to the email template name
*
* @var string
*/
protected $email_template_base_dir = 'short/';
/** /**
* Is this method available for the user? * Is this method available for the user?
* This is checked on the notifications options * This is checked on the notifications options