diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2006-08-28 15:50:33 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-08-28 15:50:33 +0000 |
commit | 1d37b69ddd79d9d6bc1346f3761a899d20305636 (patch) | |
tree | 7b795bcfea4d119c86b59a7471be36504b4f9c1b /phpBB/includes/acp/acp_jabber.php | |
parent | 902285684d08394437650174fa9bdfe6904db85c (diff) | |
download | forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.tar forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.tar.gz forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.tar.bz2 forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.tar.xz forums-1d37b69ddd79d9d6bc1346f3761a899d20305636.zip |
- some bugfixes
- using E_USER_WARNING if an error occurred within the ACP (sadly not able to use it as a default for trigger_error - it seems to be hardcoded in PHP)
git-svn-id: file:///svn/phpbb/trunk@6320 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_jabber.php')
-rw-r--r-- | phpBB/includes/acp/acp_jabber.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php index 7c7e4586e0..b55ac27fea 100644 --- a/phpBB/includes/acp/acp_jabber.php +++ b/phpBB/includes/acp/acp_jabber.php @@ -65,7 +65,7 @@ class acp_jabber { if (!$jabber->connect()) { - trigger_error($user->lang['ERR_JAB_CONNECT'] . adm_back_link($this->u_action)); + trigger_error($user->lang['ERR_JAB_CONNECT'] . 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. @@ -94,12 +94,12 @@ class acp_jabber { if (!$jabber->connect()) { - trigger_error($user->lang['ERR_JAB_CONNECT'] . adm_back_link($this->u_action)); + trigger_error($user->lang['ERR_JAB_CONNECT'] . 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)); + trigger_error($user->lang['ERR_JAB_AUTH'] . adm_back_link($this->u_action), E_USER_WARNING); } $jabber->send_presence(NULL, NULL, 'online'); |