makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10763] Do not call messenger::error() statically

Browse source 
PHPBB3-10763
This commit is contained in:
Joas Schilling 2014-03-09 22:03:38 +01:00
parent 37dace4967
commit 521c6c7d75
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/functions_messenger.php
View file

@ -768,13 +768,15 @@ class queue
if (!$this->jabber->connect()) if (!$this->jabber->connect())
{ {
messenger::error('JABBER', $user->lang['ERR_JAB_CONNECT']); $messenger = new messenger();
$messenger->error('JABBER', $user->lang['ERR_JAB_CONNECT']);
continue 2; continue 2;
} }
if (!$this->jabber->login()) if (!$this->jabber->login())
{ {
messenger::error('JABBER', $user->lang['ERR_JAB_AUTH']); $messenger = new messenger();
$messenger->error('JABBER', $user->lang['ERR_JAB_AUTH']);
continue 2; continue 2;
} }
@ -807,7 +809,8 @@ class queue
if (!$result) if (!$result)
{ {
messenger::error('EMAIL', $err_msg); $messenger = new messenger();
$messenger->error('EMAIL', $err_msg);
continue 2; continue 2;
} }
break; break;
@ -817,7 +820,8 @@ class queue
{ {
if ($this->jabber->send_message($address, $msg, $subject) === false) if ($this->jabber->send_message($address, $msg, $subject) === false)
{ {
messenger::error('JABBER', $this->jabber->get_log()); $messenger = new messenger();
$messenger->error('JABBER', $this->jabber->get_log());
continue 3; continue 3;
} }
} }