aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/notification/method/jabber.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2013-03-16 21:49:00 +0100
committerAndreas Fischer <bantu@phpbb.com>2013-03-16 21:50:30 +0100
commitc9e7247ab4234ad13d239e2b34c4ec4b305ef8ae (patch)
tree4062bd361e07f07f18350623dedc277a25bec7d4 /phpBB/includes/notification/method/jabber.php
parent51c1ba12c119127263fa82964d8f6e0ef6eccf87 (diff)
downloadforums-c9e7247ab4234ad13d239e2b34c4ec4b305ef8ae.tar
forums-c9e7247ab4234ad13d239e2b34c4ec4b305ef8ae.tar.gz
forums-c9e7247ab4234ad13d239e2b34c4ec4b305ef8ae.tar.bz2
forums-c9e7247ab4234ad13d239e2b34c4ec4b305ef8ae.tar.xz
forums-c9e7247ab4234ad13d239e2b34c4ec4b305ef8ae.zip
[ticket/11445] Add abstract class phpbb_notification_method_messenger_base.
PHPBB3-11445
Diffstat (limited to 'phpBB/includes/notification/method/jabber.php')
-rw-r--r--phpBB/includes/notification/method/jabber.php18
1 files changed, 2 insertions, 16 deletions
diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/includes/notification/method/jabber.php
index 863846b8a5..debffa8ce5 100644
--- a/phpBB/includes/notification/method/jabber.php
+++ b/phpBB/includes/notification/method/jabber.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
*
* @package notifications
*/
-class phpbb_notification_method_jabber extends phpbb_notification_method_email
+class phpbb_notification_method_jabber extends phpbb_notification_method_messenger_base
{
/**
* Get notification method name
@@ -34,20 +34,6 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
}
/**
- * 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_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?
* This is checked on the notifications options
*/
@@ -72,6 +58,6 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
return;
}
- return parent::notify();
+ return $this->notify_using_messenger(NOTIFY_IM, 'short/');
}
}