aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-04-24 10:37:53 -0500
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-04-24 10:37:53 -0500
commit212971a3a6c7d2b336408f6432218ced55ac36a0 (patch)
tree2d5c23c76d755685ce641b50ecc7f2ed710a19c0
parentab628cbdb99eda1c3efbbca7e374f64876800428 (diff)
downloadforums-212971a3a6c7d2b336408f6432218ced55ac36a0.tar
forums-212971a3a6c7d2b336408f6432218ced55ac36a0.tar.gz
forums-212971a3a6c7d2b336408f6432218ced55ac36a0.tar.bz2
forums-212971a3a6c7d2b336408f6432218ced55ac36a0.tar.xz
forums-212971a3a6c7d2b336408f6432218ced55ac36a0.zip
[ticket/11454] Correct jabber global available check
Copied from msg_jabber() PBPBB3-11454
-rw-r--r--phpBB/includes/notification/method/jabber.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/notification/method/jabber.php b/phpBB/includes/notification/method/jabber.php
index debffa8ce5..d3b756d020 100644
--- a/phpBB/includes/notification/method/jabber.php
+++ b/phpBB/includes/notification/method/jabber.php
@@ -48,7 +48,13 @@ class phpbb_notification_method_jabber extends phpbb_notification_method_messeng
*/
public function global_available()
{
- return ($this->config['jab_enable'] && @extension_loaded('xml'));
+ return !(
+ empty($this->config['jab_enable']) ||
+ empty($this->config['jab_host']) ||
+ empty($this->config['jab_username']) ||
+ empty($this->config['jab_password']) ||
+ !@extension_loaded('xml')
+ );
}
public function notify()