json_decode() returns null on error, not false

diff --git a/framework/Serialize/lib/Horde/Serialize.php b/framework/Serialize/lib/Horde/Serialize.php
index 3130b28..39e85ac 100644 (file)
--- a/framework/Serialize/lib/Horde/Serialize.php
+++ b/framework/Serialize/lib/Horde/Serialize.php
@@ -355,7 +355,10 @@ class Horde_Serialize
             break;
 
         case self::JSON:
-            $data = json_decode($data);
+            $out = json_decode($data);
+            if (!is_null($out) || (strcasecmp($data, 'null') === 0)) {
+                return $out;
+            }
             break;
 
         case self::LZF: