diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-03-29 08:58:40 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-03-29 08:58:40 -0700 |
| commit | 133307b6bfa49aacccbcd182034ea14bf524bea9 (patch) | |
| tree | f822cc7e58bed5c17f0a88115cb248b4a9b2860b /phpBB/includes/notification/method/jabber.php | |
| parent | fe93ceb20ec23752cdfc7b5c21dfb162ed288fae (diff) | |
| parent | c9e7247ab4234ad13d239e2b34c4ec4b305ef8ae (diff) | |
| download | forums-133307b6bfa49aacccbcd182034ea14bf524bea9.tar forums-133307b6bfa49aacccbcd182034ea14bf524bea9.tar.gz forums-133307b6bfa49aacccbcd182034ea14bf524bea9.tar.bz2 forums-133307b6bfa49aacccbcd182034ea14bf524bea9.tar.xz forums-133307b6bfa49aacccbcd182034ea14bf524bea9.zip | |
Merge pull request #1300 from bantu/ticket/11451
[ticket/11445] Add abstract class phpbb_notification_method_messenger_ba...
Diffstat (limited to 'phpBB/includes/notification/method/jabber.php')
| -rw-r--r-- | phpBB/includes/notification/method/jabber.php | 18 |
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/'); } } |