Merge remote-tracking branch 'remotes/api/MAGETWO-44235-Error-when-trying-to-assign-a-store-from-one-website-to-another' into API-Bug-PR

Cari Spruiell · Cari Spruiell · commit a58bda714ee1 · 2015-11-02T09:51:34.000-06:00
diff --git a/app/code/Magento/Store/Model/StoreResolver.php b/app/code/Magento/Store/Model/StoreResolver.php
@@ -88,7 +88,7 @@ public function getCurrentStoreId()
             }
 
             if (!in_array($store->getId(), $stores)) {
-                throw new NoSuchEntityException(__('Requested scope cannot be loaded'));
+                $store = $this->getDefaultStoreById($defaultStoreId);
             }
         } else {
             $store = $this->getDefaultStoreById($defaultStoreId);

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function getCurrentStoreId()`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`if (!in_array($store->getId(), $stores)) {`
`91`		`- throw new NoSuchEntityException(__('Requested scope cannot be loaded'));`
	`91`	`+ $store = $this->getDefaultStoreById($defaultStoreId);`
`92`	`92`	`}`
`93`	`93`	`} else {`
`94`	`94`	`$store = $this->getDefaultStoreById($defaultStoreId);`