ENGCOM-2444: Resolve incorrect scope code selection when the requested scopeCode is null #16940

nmalevanec · nmalevanec · commit 59d1e79293cc · 2018-10-22T13:03:09.000+03:00
diff --git a/app/code/Magento/Store/Model/StoreManager.php b/app/code/Magento/Store/Model/StoreManager.php
@@ -234,11 +234,11 @@ public function getWebsites($withDefault = false, $codeKey = false)
     public function reinitStores()
     {
         $this->currentStoreId = null;
-        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, [StoreResolver::CACHE_TAG, Store::CACHE_TAG]);
-        $this->scopeConfig->clean();
         $this->storeRepository->clean();
         $this->websiteRepository->clean();
         $this->groupRepository->clean();
+        $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, [StoreResolver::CACHE_TAG, Store::CACHE_TAG]);
+        $this->scopeConfig->clean();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -234,11 +234,11 @@ public function getWebsites($withDefault = false, $codeKey = false)`
`234`	`234`	`public function reinitStores()`
`235`	`235`	`{`
`236`	`236`	`$this->currentStoreId = null;`
`237`		`- $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, [StoreResolver::CACHE_TAG, Store::CACHE_TAG]);`
`238`		`- $this->scopeConfig->clean();`
`239`	`237`	`$this->storeRepository->clean();`
`240`	`238`	`$this->websiteRepository->clean();`
`241`	`239`	`$this->groupRepository->clean();`
	`240`	`+ $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, [StoreResolver::CACHE_TAG, Store::CACHE_TAG]);`
	`241`	`+ $this->scopeConfig->clean();`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`/**`