Skip to content

Commit 0851d4a

Browse files
committed
Merge branch 'bugfix/730-pagebuilder-breaks-clean-install' of github.com:hardyjohnson/magento2-page-builder into develop-prs
2 parents aa5f70c + 620101c commit 0851d4a

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

app/code/Magento/PageBuilder/Plugin/Catalog/Model/Product/Attribute/RepositoryPlugin.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ public function beforeSave(
3636
\Magento\Catalog\Model\Product\Attribute\Repository $subject,
3737
\Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
3838
) {
39-
$isPageBuilderEnabled = $attribute->getData('extension_attributes')
40-
? $attribute->getData('extension_attributes')->getIsPagebuilderEnabled()
39+
$extensionAttributes = $attribute->getData('extension_attributes');
40+
$isPageBuilderEnabled = ($extensionAttributes && method_exists($extensionAttributes, 'getIsPagebuilderEnabled'))
41+
? $extensionAttributes->getIsPagebuilderEnabled()
4142
: 0;
4243
$attribute->setData('is_pagebuilder_enabled', $isPageBuilderEnabled);
4344
}
@@ -58,7 +59,11 @@ public function afterGet(
5859
$extensionAttribute = $result->getExtensionAttributes()
5960
? $result->getExtensionAttributes()
6061
: $this->extensionAttributesFactory->create();
61-
$extensionAttribute->setIsPagebuilderEnabled($isPageBuilderEnabled);
62+
63+
if (method_exists($extensionAttribute, 'setIsPagebuilderEnabled')) {
64+
$extensionAttribute->setIsPagebuilderEnabled($isPageBuilderEnabled);
65+
}
66+
6267
$result->setExtensionAttributes($extensionAttribute);
6368
return $result;
6469
}

0 commit comments

Comments
 (0)