Probably fixes issue with looping XMPP queue items

diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index f8476cd8f2b2fadc7864bcf3760fd83debc6840f..da205043298ab081f788a1f984ae3bef15da4bae 100644 (file)
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -315,9 +315,13 @@ class XmppPlugin extends ImPlugin
 
     function sendNotice($screenname, Notice $notice)
     {
-        $msg   = $this->formatNotice($notice);
-        $entry = $this->format_entry($notice);
-
+        try {
+            $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);
         return true;
     }