Merge pull request #267 from pvldigital/master

Fix #250
spicywebau · Sep 30, 2019 · 394d656 · 394d656
2 parents c521d95 + aee228a
commit 394d656
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+### Fixed
+- Fix #250. When rebuilding the project.yaml file, the fieldLayouts will now correctly be included
+
 ## 2.5.1 - 2019-09-24
 ### Fixed
 - Fix #263 - correctly get the children blocks (GraphQL)

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -186,9 +186,11 @@ private function _setupProjectConfig()
 				{
 					$fieldLayout = $fieldsService->getLayoutById($blockType['fieldLayoutId']);
 					$fieldLayoutConfig = $fieldLayout->getConfig();
-					$blockType['fieldLayouts'] = [
-						$fieldLayout->uid => $fieldLayoutConfig,
-					];
+					if ($fieldLayoutConfig) {
+						$blockTypeData[$blockType['uid']]['fieldLayouts'] = [
+							$fieldLayout->uid => $fieldLayoutConfig,
+						];
+					}
 				}
 
 				unset($blockType['fieldLayoutId']);