MC-15322: Fatal error when selecting Product CMS page design

danmooney2 · danmooney2 · commit 888fa8fd98dd · 2019-03-08T14:51:35.000-06:00
Type-check $product
diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/attribute_list.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/attribute_list.phtml
@@ -14,7 +14,7 @@
     $helper = $this->helper(Magento\Catalog\Helper\Output::class);
     $product = $block->getProduct();
 ?>
-<?php if ($additional = $block->getAdditionalData()) : ?>
+<?php if ($product && ($additional = $block->getAdditionalData())) : ?>
     <div class="pagebuilder-attributes-wrapper">
         <?php foreach ($additional as $data) : ?>
             <div class="product-full-width-section">
diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/section_wrapper.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/section_wrapper.phtml
@@ -9,7 +9,7 @@
  *
  * @var \Magento\Framework\View\Element\Template $block
  */
-$childHtml = $block->getChildHtml();
+$childHtml = $block->getProduct() ? $block->getChildHtml() : '';
 ?>
 <?php if (trim($childHtml) !== "") : ?>
     <div class="product-full-width-section">

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`* @var \Magento\Framework\View\Element\Template $block`
`11`	`11`	`*/`
`12`		`-$childHtml = $block->getChildHtml();`
	`12`	`+$childHtml = $block->getProduct() ? $block->getChildHtml() : '';`
`13`	`13`	`?>`
`14`	`14`	`<?php if (trim($childHtml) !== "") : ?>`
`15`	`15`	`<div class="product-full-width-section">`