Add urlshortenerplugin2.php to solve some @todo's and adding exceptions

[quix0rs-gnu-social.git] / lib / queuemanager.php

diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index c8409df2e489933ec74b17a493f7cbcc969d7f1b..bc18e1fc56fe9e39ca6a769c8eec9dcdd46ff599 100644 (file)
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -67,9 +67,6 @@ abstract class QueueManager extends IoManager
                     self::$qm = new UnQueueManager();
                 } else {
                     switch ($type) {
-                     case 'cron':
-                        self::$qm = new CronQueueManager();
-                        break;
                      case 'db':
                         self::$qm = new DBQueueManager();
                         break;
@@ -183,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');