Merge remote-tracking branch 'mainline/2.3.2-develop' into MC-16644

danielrenaud · danielrenaud · commit fc2c797fa0bb · 2019-05-21T15:00:08.000-05:00
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
@@ -948,10 +948,10 @@ public function beforeSave()
             )
             && !$this->authorization->isAllowed('Magento_Catalog::edit_category_design')
         ) {
-            $this->getCustomAttributes();
             foreach ($this->_designAttributes as $attributeCode) {
                 $this->setData($attributeCode, $value = $this->getOrigData($attributeCode));
-                if (array_key_exists($attributeCode, $this->_data[self::CUSTOM_ATTRIBUTES])) {
+                if (!empty($this->_data[self::CUSTOM_ATTRIBUTES])
+                    && array_key_exists($attributeCode, $this->_data[self::CUSTOM_ATTRIBUTES])) {
                     //In case custom attribute were used to update the entity.
                     $this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode]->setValue($value);
                 }

Original file line number	Diff line number	Diff line change
`@@ -948,10 +948,10 @@ public function beforeSave()`
`948`	`948`	`)`
`949`	`949`	`&& !$this->authorization->isAllowed('Magento_Catalog::edit_category_design')`
`950`	`950`	`) {`
`951`		`- $this->getCustomAttributes();`
`952`	`951`	`foreach ($this->_designAttributes as $attributeCode) {`
`953`	`952`	`$this->setData($attributeCode, $value = $this->getOrigData($attributeCode));`
`954`		`- if (array_key_exists($attributeCode, $this->_data[self::CUSTOM_ATTRIBUTES])) {`
	`953`	`+ if (!empty($this->_data[self::CUSTOM_ATTRIBUTES])`
	`954`	`+ && array_key_exists($attributeCode, $this->_data[self::CUSTOM_ATTRIBUTES])) {`
`955`	`955`	`//In case custom attribute were used to update the entity.`
`956`	`956`	`$this->_data[self::CUSTOM_ATTRIBUTES][$attributeCode]->setValue($value);`
`957`	`957`	`}`