Merge pull request #1618 from Guite/1.3

This PR was merged into zikula:1.3 branch.

Discussion
----------

More solid block content decoding

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | Guite/MostGenerator#499
| Refs tickets  | 
| License       | MIT
| Doc PR        | 

Commits
-------

05a3297 More solid block content decoding Guite
918b15f Update CHANGELOG Guite
ace4f36 Use DataUtil API for checking if content is serialised Guite

src/docs/CHANGELOG

@@ -20,7 +20,8 @@ CHANGELOG - ZIKULA 1.3.7
 - Fixed bugs in DBObject #616, #617, #618
 - Fixed Formutil z-formrow - label - input type file looks bad on Safari (webkit) #621
 - Added fileupload input styling Webkit #622 
-- Fix developer notices #564 
+- Fix developer notices #564
+- Fixed decoding of Block content which made problems on some servers
 
 
 CHANGELOG - ZIKULA 1.3.6

src/lib/util/BlockUtil.php

@@ -428,12 +428,12 @@ 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
+        // Try to unserialize first
+        if (DataUtil::is_serialized($content, false)) {
             $vars = unserialize($content);
-
-            return $vars;
+            if ($vars !== false && is_array($vars)) {
+                return $vars;
+            }
         }
 
         // Unserialised content