GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Probably fixes issue with looping XMPP queue items

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-03-28 11:33:52 +02:00
parent f134a423f6
commit 2e327dfcd7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/Xmpp/XmppPlugin.php
View File

@ -315,9 +315,13 @@ class XmppPlugin extends ImPlugin
function sendNotice($screenname, Notice $notice) function sendNotice($screenname, Notice $notice)
{ {
$msg = $this->formatNotice($notice); try {
$entry = $this->format_entry($notice); $msg = $this->formatNotice($notice);
$entry = $this->format_entry($notice);
} catch (Exception $e) {
common_log(LOG_ERR, __METHOD__ . ": Discarding outgoing stanza because of exception: {$e->getMessage()}");
return false; // return value of sendNotice is never actually used as of now
}
$this->queuedConnection()->message($screenname, $msg, 'chat', null, $entry); $this->queuedConnection()->message($screenname, $msg, 'chat', null, $entry);
return true; return true;
} }