MAGETWO-50289: Merge branch 'patch-1' of github.com:liolemaire/magento2 into github_pr

ishakhsuvarov · ishakhsuvarov · commit efe8a567c68c · 2016-06-15T10:00:47.000+03:00
diff --git a/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapper.php b/app/code/Magento/Eav/Model/Entity/Setup/PropertyMapper.php
@@ -22,6 +22,7 @@ class PropertyMapper extends PropertyMapperAbstract
     public function map(array $input, $entityTypeId)
     {
         return [
+            'attribute_model' => $this->_getValue($input, 'attribute_model'),
             'backend_model' => $this->_getValue($input, 'backend'),
             'backend_type' => $this->_getValue($input, 'type', 'varchar'),
             'backend_table' => $this->_getValue($input, 'table'),

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ class PropertyMapper extends PropertyMapperAbstract`
`22`	`22`	`public function map(array $input, $entityTypeId)`
`23`	`23`	`{`
`24`	`24`	`return [`
	`25`	`+ 'attribute_model' => $this->_getValue($input, 'attribute_model'),`
`25`	`26`	`'backend_model' => $this->_getValue($input, 'backend'),`
`26`	`27`	`'backend_type' => $this->_getValue($input, 'type', 'varchar'),`
`27`	`28`	`'backend_table' => $this->_getValue($input, 'table'),`