MAGETWO-54615: Behavioral bug in CustomerRepositoryInterface::save() implementation #5050

okarpenko · okarpenko · commit 491a1012fb1e · 2016-06-23T12:58:26.000+03:00
diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -235,11 +235,11 @@ private function populateCustomerWithSecureData($customerModel, $passwordHash =
             $customerModel->setFailuresNum($customerSecure->getFailuresNum());
             $customerModel->setFirstFailure($customerSecure->getFirstFailure());
             $customerModel->setLockExpires($customerSecure->getLockExpires());
-        } elseif ($passwordHash !== null) {
+        } elseif ($passwordHash) {
             $customerModel->setPasswordHash($passwordHash);
         }
 
-        if ($customerModel->getId() && $passwordHash !== null) {
+        if ($passwordHash && $customerModel->getId()) {
             $this->customerRegistry->remove($customerModel->getId());
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -235,11 +235,11 @@ private function populateCustomerWithSecureData($customerModel, $passwordHash =`
`235`	`235`	`$customerModel->setFailuresNum($customerSecure->getFailuresNum());`
`236`	`236`	`$customerModel->setFirstFailure($customerSecure->getFirstFailure());`
`237`	`237`	`$customerModel->setLockExpires($customerSecure->getLockExpires());`
`238`		`- } elseif ($passwordHash !== null) {`
	`238`	`+ } elseif ($passwordHash) {`
`239`	`239`	`$customerModel->setPasswordHash($passwordHash);`
`240`	`240`	`}`
`241`	`241`
`242`		`- if ($customerModel->getId() && $passwordHash !== null) {`
	`242`	`+ if ($passwordHash && $customerModel->getId()) {`
`243`	`243`	`$this->customerRegistry->remove($customerModel->getId());`
`244`	`244`	`}`
`245`	`245`	`}`