Upgrade to 3.5

2020-12-15 11:01:41 +01:00
parent eabce32cf0
commit 9109130c9c
43 changed files with 306 additions and 159 deletions
--- a/kirby/src/Cms/Blocks.php
+++ b/kirby/src/Cms/Blocks.php
@@ -76,8 +76,12 @@ class Blocks extends Items
            return [];
        }

-        // no layouts
-        if (array_key_exists('columns', $input[0]) === false) {
+        if (
+            // no columns = no layout
+            array_key_exists('columns', $input[0]) === false ||
+            // checks if this is a block for the builder plugin
+            array_key_exists('_key', $input[0]) === true
+        ) {
            return $input;
        }