MAGETWO-71136: Cannot save attribute in product page admin with a related conf product that has different attribute set sharing a multiselect attribute

Stanislav Idolov · Stanislav Idolov · commit 1218a61584ef · 2017-08-17T16:48:19.000+03:00
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -601,7 +601,7 @@ protected function _isApplicableAttribute($object, $attribute)
      */
     private function getAttributesByScope($suffix)
     {
-        return (isset($this->attributesByScope[$suffix]) && !empty($this->attributesByScope[$suffix]))
+        return !empty($this->attributesByScope[$suffix])
             ? $this->attributesByScope[$suffix]
             : $this->getAttributesByCode();
     }

Original file line number	Diff line number	Diff line change
`@@ -601,7 +601,7 @@ protected function _isApplicableAttribute($object, $attribute)`
`601`	`601`	`*/`
`602`	`602`	`private function getAttributesByScope($suffix)`
`603`	`603`	`{`
`604`		`- return (isset($this->attributesByScope[$suffix]) && !empty($this->attributesByScope[$suffix]))`
	`604`	`+ return !empty($this->attributesByScope[$suffix])`
`605`	`605`	`? $this->attributesByScope[$suffix]`
`606`	`606`	`: $this->getAttributesByCode();`
`607`	`607`	`}`