MAGETWO-44235: Error when trying to assign a store from one website to another

Hayder Sharhan · Hayder Sharhan · commit 5a793ccc4d6e · 2015-10-26T15:12:05.000-05:00
- There was a dead end in the code. With this change, the user is redirected to the default store which would reset his cookies to that store.
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);`