Use DataUtil API for checking if content is serialised

zikula · Feb 16, 2014 · ace4f36 · ace4f36
1 parent 918b15f
commit ace4f36
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/lib/util/BlockUtil.php b/src/lib/util/BlockUtil.php
@@ -429,9 +429,11 @@ public static function loadAll()
     public static function varsFromContent($content)
     {
         // Try to unserialize first
-        $vars = unserialize($content);
-        if ($vars !== false && is_array($vars)) {
-            return $vars;
+        if (DataUtil::is_serialized($content, false)) {
+            $vars = unserialize($content);
+            if ($vars !== false && is_array($vars)) {
+                return $vars;
+            }
         }
 
         // Unserialised content