#22869 - defaulting customer storeId fix

Wirson · Wirson · commit f22ab3c06303 · 2019-05-14T16:33:09.000+02:00
diff --git a/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php b/app/code/Magento/Customer/Model/ResourceModel/CustomerRepository.php
@@ -209,7 +209,7 @@ public function save(CustomerInterface $customer, $passwordHash = null)
         $customerModel->setId($customer->getId());
         $storeId = $customerModel->getStoreId();
         if ($storeId === null) {
-            $customerModel->setStoreId($this->storeManager->getStore()->getId());
+            $customerModel->setStoreId($prevCustomerData->getStoreId() ?? $this->storeManager->getStore()->getId());
         }
         // Need to use attribute set or future updates can cause data loss
         if (!$customerModel->getAttributeSetId()) {

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public function save(CustomerInterface $customer, $passwordHash = null)`
`209`	`209`	`$customerModel->setId($customer->getId());`
`210`	`210`	`$storeId = $customerModel->getStoreId();`
`211`	`211`	`if ($storeId === null) {`
`212`		`- $customerModel->setStoreId($this->storeManager->getStore()->getId());`
	`212`	`+ $customerModel->setStoreId($prevCustomerData->getStoreId() ?? $this->storeManager->getStore()->getId());`
`213`	`213`	`}`
`214`	`214`	`// Need to use attribute set or future updates can cause data loss`
`215`	`215`	`if (!$customerModel->getAttributeSetId()) {`