aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/notification/method/jabber.php
diff options
context:
space:
mode:
authorMáté Bartus <CHItA@users.noreply.github.com>2017-09-07 14:31:04 +0200
committerGitHub <noreply@github.com>2017-09-07 14:31:04 +0200
commit6e7593a5db7f8a8cb151882cb649362c85ad8732 (patch)
treeb98581f60d82b1bb3983c5b6abc5002de2835c66 /phpBB/phpbb/notification/method/jabber.php
parentc1b00896b4d5d0b62798de7630686365b7aa8c05 (diff)
parentedd1ce74436c399f407e667b0b81b329a57a6f15 (diff)
downloadforums-6e7593a5db7f8a8cb151882cb649362c85ad8732.tar
forums-6e7593a5db7f8a8cb151882cb649362c85ad8732.tar.gz
forums-6e7593a5db7f8a8cb151882cb649362c85ad8732.tar.bz2
forums-6e7593a5db7f8a8cb151882cb649362c85ad8732.tar.xz
forums-6e7593a5db7f8a8cb151882cb649362c85ad8732.zip
Merge pull request #4918 from kasimi/ticket/15328
[ticket/15328] Disable checkbox if notification method isn't supported
Diffstat (limited to 'phpBB/phpbb/notification/method/jabber.php')
-rw-r--r--phpBB/phpbb/notification/method/jabber.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/phpbb/notification/method/jabber.php b/phpBB/phpbb/notification/method/jabber.php
index 509c6b432c..81fdb378e2 100644
--- a/phpBB/phpbb/notification/method/jabber.php
+++ b/phpBB/phpbb/notification/method/jabber.php
@@ -13,6 +13,8 @@
namespace phpbb\notification\method;
+use phpbb\notification\type\type_interface;
+
/**
* Jabber notification method class
* This class handles sending Jabber messages for notifications
@@ -56,10 +58,14 @@ class jabber extends \phpbb\notification\method\messenger_base
/**
* Is this method available for the user?
* This is checked on the notifications options
+ *
+ * @param type_interface $notification_type An optional instance of a notification type. If provided, this
+ * method additionally checks if the type provides an email template.
+ * @return bool
*/
- public function is_available()
+ public function is_available(type_interface $notification_type = null)
{
- return ($this->global_available() && $this->user->data['user_jabber']);
+ return parent::is_available($notification_type) && $this->global_available() && $this->user->data['user_jabber'];
}
/**