diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-09-02 17:24:56 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-09-02 17:24:56 +0000 |
| commit | cda8083ba73d8884780a3e802b32b0441d2170b0 (patch) | |
| tree | 3cd58211ccc477dd3fdde2047721877c623e3723 /phpBB/includes/functions_messenger.php | |
| parent | 83c83e0e6cb6efb6ae408a5b1a7afd77d57a63b4 (diff) | |
| download | forums-cda8083ba73d8884780a3e802b32b0441d2170b0.tar forums-cda8083ba73d8884780a3e802b32b0441d2170b0.tar.gz forums-cda8083ba73d8884780a3e802b32b0441d2170b0.tar.bz2 forums-cda8083ba73d8884780a3e802b32b0441d2170b0.tar.xz forums-cda8083ba73d8884780a3e802b32b0441d2170b0.zip | |
fixing some bugs
git-svn-id: file:///svn/phpbb/trunk@8075 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index ae156436f0..90413d80de 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -275,7 +275,7 @@ class messenger break; } - $message .= '<br /><em>' . htmlspecialchars($calling_page) . '<em><br /><br />' . $msg . '<br />'; + $message .= '<br /><em>' . htmlspecialchars($calling_page) . '</em><br /><br />' . $msg . '<br />'; add_log('critical', 'LOG_ERROR_' . $type, $message); } @@ -465,13 +465,13 @@ class messenger if (!$this->jabber->connect()) { - $this->error('JABBER', 'Could not connect to Jabber server<br />' . $this->jabber->get_log()); + $this->error('JABBER', $user->lang['ERR_JAB_CONNECT'] . '<br />' . $this->jabber->get_log()); return false; } if (!$this->jabber->login()) { - $this->error('JABBER', 'Could not authorise on Jabber server<br />' . $this->jabber->get_log()); + $this->error('JABBER', $user->lang['ERR_JAB_AUTH'] . '<br />' . $this->jabber->get_log()); return false; } @@ -541,7 +541,7 @@ class queue */ function process() { - global $db, $config, $phpEx, $phpbb_root_path; + global $db, $config, $phpEx, $phpbb_root_path, $user; set_config('last_queue_run', time(), true); @@ -604,13 +604,13 @@ class queue if (!$this->jabber->connect()) { - messenger::error('JABBER', 'Could not connect to Jabber server'); + messenger::error('JABBER', $user->lang['ERR_JAB_CONNECT']); continue 2; } if (!$this->jabber->login()) { - messenger::error('JABBER', 'Could not authorise on Jabber server'); + messenger::error('JABBER', $user->lang['ERR_JAB_AUTH']); continue 2; } |