diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-09 22:03:38 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-09 22:03:38 +0100 |
| commit | 521c6c7d75b8c929dfe7870e6d9c8b32300bc29a (patch) | |
| tree | cb3bfda7bb95c1b852316ef66c163d21f411be41 /phpBB/includes/functions_messenger.php | |
| parent | 37dace4967c39683421fc8f41ba7a25b9d8dc753 (diff) | |
| download | forums-521c6c7d75b8c929dfe7870e6d9c8b32300bc29a.tar forums-521c6c7d75b8c929dfe7870e6d9c8b32300bc29a.tar.gz forums-521c6c7d75b8c929dfe7870e6d9c8b32300bc29a.tar.bz2 forums-521c6c7d75b8c929dfe7870e6d9c8b32300bc29a.tar.xz forums-521c6c7d75b8c929dfe7870e6d9c8b32300bc29a.zip | |
[ticket/10763] Do not call messenger::error() statically
PHPBB3-10763
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 6ceeb50330..907252f6d8 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -768,13 +768,15 @@ class queue 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; } 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; } @@ -807,7 +809,8 @@ class queue if (!$result) { - messenger::error('EMAIL', $err_msg); + $messenger = new messenger(); + $messenger->error('EMAIL', $err_msg); continue 2; } break; @@ -817,7 +820,8 @@ class queue { 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; } } |