diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-03-07 16:09:55 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-03-07 16:09:55 +0100 |
| commit | 20f84c3795b55b20a5338de4e09455de651a7007 (patch) | |
| tree | 0635feae5b40b20efcfeb519a90fc3c66e2c6f54 /phpBB/includes/notification/method/jabber.php | |
| parent | 1a498524138a7a3192ad14ad10f714b34488321f (diff) | |
| parent | d658d6640ba35ef162c7d1d3f696f28d1387bf3d (diff) | |
| download | forums-20f84c3795b55b20a5338de4e09455de651a7007.tar forums-20f84c3795b55b20a5338de4e09455de651a7007.tar.gz forums-20f84c3795b55b20a5338de4e09455de651a7007.tar.bz2 forums-20f84c3795b55b20a5338de4e09455de651a7007.tar.xz forums-20f84c3795b55b20a5338de4e09455de651a7007.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3:
[ticket/11408] user_jabber instead of jabber
[ticket/10202] Rename method names _all() to _array().
[ticket/10202] Add migration file for config_db_text.
[ticket/10202] Upgrade TEXT to the bigger MTEXT.
[ticket/10202] Improve method documentation.
[ticket/10202] SQL escape the table name.
[ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
[ticket/10202] Define phpbb_config_db_text as a service.
[ticket/10202] Add tests for phpbb_config_db_text.
[ticket/10202] Adjust method names to guidelines.
[ticket/10202] Add database schema for phpbb_config_db_text.
[ticket/10202] Implementation of config options with arbitrary length values.
[ticket/11166] Add ajaxify support to normal ACP confirm_box()
[ticket/11166] Fix several custom confirm templates in prosilver
[ticket/11166] Add caption to AJAX confirm box default template
[ticket/11166] Fix typo in comment
[ticket/11166] Use provided custom templates on AJAX confirm box
Diffstat (limited to 'phpBB/includes/notification/method/jabber.php')
| -rw-r--r-- | phpBB/includes/notification/method/jabber.php | 2 |
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']); } /** |