1 files changed, 2 insertions, 13 deletions
diff --git a/lib/queuemanager.php b/lib/queuemanager.php
index 4eb39bfa8..8921b02cc 100644
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@ -139,20 +139,13 @@ abstract class QueueManager extends IoManager
 
     /**
      * Encode an object for queued storage.
-     * Next gen may use serialization.
      *
      * @param mixed $object
      * @return string
      */
     protected function encode($object)
     {
-        if ($object instanceof Notice) {
-            return $object->id;
-        } else if (is_string($object)) {
-            return $object;
-        } else {
-            throw new ServerException("Can't queue this type", 500);
-        }
+        return serialize($object);
     }
 
     /**
@@ -164,11 +157,7 @@ abstract class QueueManager extends IoManager
      */
     protected function decode($frame)
     {
-        if (is_numeric($frame)) {
-            return Notice::staticGet(intval($frame));
-        } else {
-            return $frame;
-        }
+        return unserialize($frame);
     }
 
     /**