From f5abccfc3a3d9826fb6dd03511afce3ab4907f8f Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 21 Jan 2011 16:39:48 -0700
Subject: [PATCH] json_decode() returns null on error, not false

---
 framework/Serialize/lib/Horde/Serialize.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/framework/Serialize/lib/Horde/Serialize.php b/framework/Serialize/lib/Horde/Serialize.php
index 3130b2847..39e85ac87 100644
--- 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:
-- 
2.11.0