Merge remote-tracking branch 'tango-ce/MAGETWO-52536' into MAGETWO-52779

magicbunneh · magicbunneh · commit 5c7c78d75869 · 2016-05-16T19:18:27.000+03:00
diff --git a/app/code/Magento/Eav/Model/Config.php b/app/code/Magento/Eav/Model/Config.php
@@ -247,7 +247,9 @@ protected function _getEntityKey($code)
      */
     protected function _getAttributeKey($entityTypeCode, $attributeCode)
     {
-        return 'ATTRIBUTE/' . $entityTypeCode . '/' . $attributeCode;
+        $codeSegments = explode('.', $attributeCode);
+
+        return 'ATTRIBUTE/' . $entityTypeCode . '/' . array_pop($codeSegments);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,9 @@ protected function _getEntityKey($code)`
`247`	`247`	`*/`
`248`	`248`	`protected function _getAttributeKey($entityTypeCode, $attributeCode)`
`249`	`249`	`{`
`250`		`- return 'ATTRIBUTE/' . $entityTypeCode . '/' . $attributeCode;`
	`250`	`+ $codeSegments = explode('.', $attributeCode);`
	`251`	`+`
	`252`	`+ return 'ATTRIBUTE/' . $entityTypeCode . '/' . array_pop($codeSegments);`
`251`	`253`	`}`
`252`	`254`
`253`	`255`	`/**`