Merge remote-tracking branch 'origin/MAGETWO-44182mainline' into BUGS

Oleksandr Karpenko · Oleksandr Karpenko · commit 90a8ead44b3a · 2015-10-22T16:48:46.000+03:00
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -1296,11 +1296,11 @@ protected function _collectSaveData($newObject)
                 } elseif (!is_numeric($v) && $v !== $origData[$k] || is_numeric($v) && $v != $origData[$k]) {
                     $update[$attrId] = [
                         'value_id' => $attribute->getBackend()->getEntityValueId($newObject),
-                        'value' => $v,
+                        'value' => is_array($v) ? array_shift($v) : $v,//@TODO: MAGETWO-44182,
                     ];
                 }
             } elseif (!$this->_isAttributeValueEmpty($attribute, $v)) {
-                $insert[$attrId] = $v;
+                $insert[$attrId] = is_array($v) ? array_shift($v) : $v;//@TODO: MAGETWO-44182
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1296,11 +1296,11 @@ protected function _collectSaveData($newObject)`
`1296`	`1296`	`} elseif (!is_numeric($v) && $v !== $origData[$k] \|\| is_numeric($v) && $v != $origData[$k]) {`
`1297`	`1297`	`$update[$attrId] = [`
`1298`	`1298`	`'value_id' => $attribute->getBackend()->getEntityValueId($newObject),`
`1299`		`- 'value' => $v,`
	`1299`	`+ 'value' => is_array($v) ? array_shift($v) : $v,//@TODO: MAGETWO-44182,`
`1300`	`1300`	`];`
`1301`	`1301`	`}`
`1302`	`1302`	`} elseif (!$this->_isAttributeValueEmpty($attribute, $v)) {`
`1303`		`- $insert[$attrId] = $v;`
	`1303`	`+ $insert[$attrId] = is_array($v) ? array_shift($v) : $v;//@TODO: MAGETWO-44182`
`1304`	`1304`	`}`
`1305`	`1305`	`}`
`1306`	`1306`