From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 16 Feb 2010 15:25:57 +0000 (-0500)
Subject: Merge branch '0.9.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=32084e33a266797b306158df29e48f057651b410;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into 1.0.x

Conflicts:
	lib/queuemanager.php
---

32084e33a266797b306158df29e48f057651b410
diff --cc lib/queuemanager.php
index a0b13fe556,64bb52e106..162c9f3757
--- a/lib/queuemanager.php
+++ b/lib/queuemanager.php
@@@ -155,14 -155,21 +155,14 @@@ abstract class QueueManager extends IoM
      }
  
      /**
 -     * Encode an object or variable for queued storage.
 -     * Notice objects are currently stored as an id reference;
 -     * other items are serialized.
 +     * Encode an object for queued storage.
       *
-      * @param mixed $object
+      * @param mixed $item
       * @return string
       */
-     protected function encode($object)
+     protected function encode($item)
      {
 -        if ($item instanceof Notice) {
 -            // Backwards compat
 -            return $item->id;
 -        } else {
 -            return serialize($item);
 -        }
 +        return serialize($object);
      }
  
      /**