MC-18685: Remove custom layout updates from admin

Oleksandr Gorkun · Oleksandr Gorkun · commit c966fdc84c5e · 2019-10-14T17:03:49.000-05:00
diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdate.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/LayoutUpdate.php
@@ -55,7 +55,7 @@ private function extractLayoutUpdate(ProductInterface $product)
     public function modifyData(array $data)
     {
         $product = $this->locator->getProduct();
-        if ($oldLayout = $this->extractLayoutUpdate($product)) {
+        if ($this->extractLayoutUpdate($product)) {
             $data[$product->getId()][AbstractModifier::DATA_SOURCE_DEFAULT]['custom_layout_update_file']
                 = \Magento\Catalog\Model\Product\Attribute\Backend\LayoutUpdate::VALUE_USE_UPDATE_XML;
         }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ private function extractLayoutUpdate(ProductInterface $product)`
`55`	`55`	`public function modifyData(array $data)`
`56`	`56`	`{`
`57`	`57`	`$product = $this->locator->getProduct();`
`58`		`- if ($oldLayout = $this->extractLayoutUpdate($product)) {`
	`58`	`+ if ($this->extractLayoutUpdate($product)) {`
`59`	`59`	`$data[$product->getId()][AbstractModifier::DATA_SOURCE_DEFAULT]['custom_layout_update_file']`
`60`	`60`	`= \Magento\Catalog\Model\Product\Attribute\Backend\LayoutUpdate::VALUE_USE_UPDATE_XML;`
`61`	`61`	`}`