More solid block content decoding

zikula · Feb 16, 2014 · 05a3297 · 05a3297
1 parent 23376d7
commit 05a3297
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/lib/util/BlockUtil.php b/src/lib/util/BlockUtil.php
@@ -428,11 +428,9 @@ public static function loadAll()
      */
     public static function varsFromContent($content)
     {
-        // Assume serialized content ends in a ";" followed by some curly-end-braces
-        if (preg_match('/;}*$/', $content)) {
-            // Serialised content
-            $vars = unserialize($content);
-
+        // Try to unserialize first
+        $vars = unserialize($content);
+        if ($vars !== false && is_array($vars)) {
             return $vars;
         }