diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-16 12:57:01 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-16 12:57:01 +0000 |
| commit | 204187187ddd3f556b67c3c78373034a73d760e7 (patch) | |
| tree | e8b7c0072afa2d8df2921279d40379d406009f93 /phpBB/includes/acp/acp_jabber.php | |
| parent | 2e4cd16058cc548068a94047c9c31e5a9ad272d0 (diff) | |
| download | forums-204187187ddd3f556b67c3c78373034a73d760e7.tar forums-204187187ddd3f556b67c3c78373034a73d760e7.tar.gz forums-204187187ddd3f556b67c3c78373034a73d760e7.tar.bz2 forums-204187187ddd3f556b67c3c78373034a73d760e7.tar.xz forums-204187187ddd3f556b67c3c78373034a73d760e7.zip | |
fix for bug #6140 (jabber not working)
git-svn-id: file:///svn/phpbb/trunk@6771 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_jabber.php')
| -rw-r--r-- | phpBB/includes/acp/acp_jabber.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php index d216ff7f9b..d58fef14f1 100644 --- a/phpBB/includes/acp/acp_jabber.php +++ b/phpBB/includes/acp/acp_jabber.php @@ -58,7 +58,7 @@ class acp_jabber { if (!$jabber->connect()) { - trigger_error($user->lang['ERR_JAB_CONNECT'] . adm_back_link($this->u_action), E_USER_WARNING); + trigger_error($user->lang['ERR_JAB_CONNECT'] . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING); } // First we'll try to authorise using this account, if that fails we'll try to create it. @@ -87,16 +87,16 @@ class acp_jabber { if (!$jabber->connect()) { - trigger_error($user->lang['ERR_JAB_CONNECT'] . adm_back_link($this->u_action), E_USER_WARNING); + trigger_error($user->lang['ERR_JAB_CONNECT'] . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING); } if (!$jabber->send_auth()) { - trigger_error($user->lang['ERR_JAB_AUTH'] . adm_back_link($this->u_action), E_USER_WARNING); + trigger_error($user->lang['ERR_JAB_AUTH'] . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING); } $jabber->send_presence(NULL, NULL, 'online'); - if (($result = $jabber->change_password($jab_password)) <> 2) + if (($result = $jabber->change_password($jab_password)) <> 2) { $error[] = ($result == 1) ? $user->lang['ERR_JAB_PASSCHG'] : sprintf($user->lang['ERR_JAB_PASSFAIL'], $result); } |