Merge commit 'refs/pull/4164/head' of https://github.com/magento/magento2 into MAGETWO-52022

Sergey Semenov · Sergey Semenov · commit 815154e43333 · 2016-04-19T17:16:30.000+03:00
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -365,7 +365,7 @@ protected function _prepareDataForUpdate(array $rowData)
 
         // password change/set
         if (isset($rowData['password']) && strlen($rowData['password'])) {
-            $entityRow['password_hash'] = $this->_customerModel->hashPassword($rowData['password']);
+            $rowData['password_hash'] = $this->_customerModel->hashPassword($rowData['password']);
         }
 
         // attribute values

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ protected function _prepareDataForUpdate(array $rowData)`
`365`	`365`
`366`	`366`	`// password change/set`
`367`	`367`	`if (isset($rowData['password']) && strlen($rowData['password'])) {`
`368`		`- $entityRow['password_hash'] = $this->_customerModel->hashPassword($rowData['password']);`
	`368`	`+ $rowData['password_hash'] = $this->_customerModel->hashPassword($rowData['password']);`
`369`	`369`	`}`
`370`	`370`
`371`	`371`	`// attribute values`