Merge branch 'release/3.6.1'

doublesecretagency · Feb 9, 2021 · 085982b · 085982b
2 parents 4ce3327 + cd4c38e
commit 085982b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ## Unreleased
 
 
+## 3.6.1 - 2021-02-09
+
+### Fixed
+- Fixed an issue with project config that could cause it to throw a big wobbly ([#105](https://github.com/angell-co/Spoon/issues/105))
+
+
 ## 3.6.0 - 2020-09-25
 
 ### Changed

diff --git a/src/services/BlockTypes.php b/src/services/BlockTypes.php
@@ -319,7 +319,7 @@ public function handleChangedBlockType(ConfigEvent $event)
             $blockTypeRecord->uid = $uid;
 
             // Handle the field layout
-            if ($data['fieldLayout']) {
+            if (isset($data['fieldLayout']) && $data['fieldLayout'] !== null) {
                 $flData = reset($data['fieldLayout']);
                 if ($flData) {
                     // Save the field layout