aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/notification/method
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/notification/method')
-rw-r--r--phpBB/includes/notification/method/email.php3
-rw-r--r--phpBB/includes/notification/method/jabber.php2
2 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/notification/method/email.php b/phpBB/includes/notification/method/email.php
index 429dfda2ba..4a7fea6df3 100644
--- a/phpBB/includes/notification/method/email.php
+++ b/phpBB/includes/notification/method/email.php
@@ -53,8 +53,7 @@ class phpbb_notification_method_email extends phpbb_notification_method_base
*/
public function is_available()
{
- // Email is always available
- return true;
+ return (bool) $this->config['email_enable'];
}
/**
diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/includes/notification/method/jabber.php
index e3eb571fbc..863846b8a5 100644
--- a/phpBB/includes/notification/method/jabber.php
+++ b/phpBB/includes/notification/method/jabber.php
@@ -53,7 +53,7 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_email
*/
public function is_available()
{
- return ($this->global_available() && $this->user->data['jabber']);
+ return ($this->global_available() && $this->user->data['user_jabber']);
}
/**