aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2013-03-06 17:01:30 -0500
committerDavid King <imkingdavid@gmail.com>2013-03-06 17:01:30 -0500
commitd658d6640ba35ef162c7d1d3f696f28d1387bf3d (patch)
treef15f4e8abf6cad702dad8935737e185299b07277 /phpBB
parent9ca15267fa91d2c9aad5df4f57a41de8b2c79be0 (diff)
parent3aab72d79bdad45933e87ebce39483a7664ffd68 (diff)
downloadforums-d658d6640ba35ef162c7d1d3f696f28d1387bf3d.tar
forums-d658d6640ba35ef162c7d1d3f696f28d1387bf3d.tar.gz
forums-d658d6640ba35ef162c7d1d3f696f28d1387bf3d.tar.bz2
forums-d658d6640ba35ef162c7d1d3f696f28d1387bf3d.tar.xz
forums-d658d6640ba35ef162c7d1d3f696f28d1387bf3d.zip
Merge remote-tracking branch 'EXreaction/ticket/11408' into develop
# By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11408: [ticket/11408] user_jabber instead of jabber
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/notification/method/jabber.php2
1 files changed, 1 insertions, 1 deletions
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']);
}
/**