From 96b0cfe66293d44db387b0de9cb3815686947ddc Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Mon, 24 Feb 2014 14:10:53 +0100
Subject: [PATCH] Don't discard XML in queue items

XMPP messages on -out at least were strings of XML that were stopped
because they weren't JSON.
---
 lib/queuemanager.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 0e37ab0c53..bc18e1fc56 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -180,7 +180,8 @@ abstract class QueueManager extends IoManager
         $object = unserialize($frame);
 
         // If it is a string, we really store a JSON object in there
-        if (is_string($object)) {
+        // except if it begins with '<', because then it is XML.
+        if (is_string($object) && substr($object, 0, 1) != '<') {
             $json = json_decode($object);
             if ($json === null) {
                 throw new Exception('Bad frame in queue item');
-- 
2.39.5