aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/notifications/method/email.php
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-09-12 23:03:26 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-09-12 23:03:26 -0500
commit97fde62b1470f04da17335674bceab3360542e3e (patch)
tree50b7ffc5d9243e9d995fcfdf6eaae29f0086ac03 /phpBB/includes/notifications/method/email.php
parent48cb98045ecd93f05b51aa528cc5248493b47c98 (diff)
downloadforums-97fde62b1470f04da17335674bceab3360542e3e.tar
forums-97fde62b1470f04da17335674bceab3360542e3e.tar.gz
forums-97fde62b1470f04da17335674bceab3360542e3e.tar.bz2
forums-97fde62b1470f04da17335674bceab3360542e3e.tar.xz
forums-97fde62b1470f04da17335674bceab3360542e3e.zip
[ticket/11103] Jabber notification method
PHPBB3-11103
Diffstat (limited to 'phpBB/includes/notifications/method/email.php')
-rw-r--r--phpBB/includes/notifications/method/email.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index d6468c9dc3..1bcea13d92 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -24,10 +24,17 @@ if (!defined('IN_PHPBB'))
class phpbb_notifications_method_email extends phpbb_notifications_method_base
{
/**
+ * Notify method (since jabber gets sent through the same messenger, we let the jabber class inherit from this to reduce code duplication)
+ *
+ * @var mixed
+ */
+ protected $notify_method = NOTIFY_EMAIL;
+
+ /**
* Is this method available for the user?
* This is checked on the notifications options
*/
- public static function is_available()
+ public function is_available()
{
// Email is always available
return true;
@@ -89,7 +96,7 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
'U_UNSUBSCRIBE' => $notification->get_unsubscribe_url(),
));
- $messenger->send('email');
+ $messenger->send($this->notify_method);
}
// Save the queue in the messenger class (has to be called or these emails could be lost?)