Merge remote-tracking branch 'tango/MC-15237' into Chaika-PR-2019-09-20

veloraven · veloraven · commit 550a645cf4a4 · 2019-09-20T16:46:04.000-05:00
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber.php
@@ -130,7 +130,7 @@ public function loadByEmail($subscriberEmail)
      */
     public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
-        $storeIds = $this->storeManager->getWebsite($customer->getWebsiteId())->getStoreIds();
+        $storeIds = $this->storeManager->getWebsite()->getStoreIds();
 
         if ($customer->getId()) {
             $select = $this->connection

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public function loadByEmail($subscriberEmail)`
`130`	`130`	`*/`
`131`	`131`	`public function loadByCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)`
`132`	`132`	`{`
`133`		`- $storeIds = $this->storeManager->getWebsite($customer->getWebsiteId())->getStoreIds();`
	`133`	`+ $storeIds = $this->storeManager->getWebsite()->getStoreIds();`
`134`	`134`
`135`	`135`	`if ($customer->getId()) {`
`136`	`136`	`$select = $this->connection`