Merge branch 'MAGETWO-54179' into BUGS

Sergii Kovalenko · Sergii Kovalenko · commit edaf7e87f833 · 2016-06-19T17:48:15.000+03:00
diff --git a/app/code/Magento/Customer/Model/EmailNotification.php b/app/code/Magento/Customer/Model/EmailNotification.php
@@ -268,8 +268,7 @@ private function getWebsiteStoreId($customer, $defaultStoreId = null)
     {
         if ($customer->getWebsiteId() != 0 && empty($defaultStoreId)) {
             $storeIds = $this->storeManager->getWebsite($customer->getWebsiteId())->getStoreIds();
-            reset($storeIds);
-            $defaultStoreId = current($storeIds);
+            $defaultStoreId = reset($storeIds);
         }
         return $defaultStoreId;
     }
@@ -282,9 +281,9 @@ private function getWebsiteStoreId($customer, $defaultStoreId = null)
      */
     public function passwordReminder(CustomerInterface $customer)
     {
-        $storeId = $this->storeManager->getStore()->getId();
+        $storeId = $this->getWebsiteStoreId($customer);
         if (!$storeId) {
-            $storeId = $this->getWebsiteStoreId($customer);
+            $storeId = $this->storeManager->getStore()->getId();
         }
 
         $customerEmailData = $this->getFullCustomerObject($customer);

Original file line number	Diff line number	Diff line change
`@@ -268,8 +268,7 @@ private function getWebsiteStoreId($customer, $defaultStoreId = null)`
`268`	`268`	`{`
`269`	`269`	`if ($customer->getWebsiteId() != 0 && empty($defaultStoreId)) {`
`270`	`270`	`$storeIds = $this->storeManager->getWebsite($customer->getWebsiteId())->getStoreIds();`
`271`		`- reset($storeIds);`
`272`		`- $defaultStoreId = current($storeIds);`
	`271`	`+ $defaultStoreId = reset($storeIds);`
`273`	`272`	`}`
`274`	`273`	`return $defaultStoreId;`
`275`	`274`	`}`
`@@ -282,9 +281,9 @@ private function getWebsiteStoreId($customer, $defaultStoreId = null)`
`282`	`281`	`*/`
`283`	`282`	`public function passwordReminder(CustomerInterface $customer)`
`284`	`283`	`{`
`285`		`- $storeId = $this->storeManager->getStore()->getId();`
	`284`	`+ $storeId = $this->getWebsiteStoreId($customer);`
`286`	`285`	`if (!$storeId) {`
`287`		`- $storeId = $this->getWebsiteStoreId($customer);`
	`286`	`+ $storeId = $this->storeManager->getStore()->getId();`
`288`	`287`	`}`
`289`	`288`
`290`	`289`	`$customerEmailData = $this->getFullCustomerObject($customer);`