Merge remote-tracking branch 'origin/MAGETWO-35890' into BUGS

slavvka · slavvka · commit d9ed070ff242 · 2015-04-14T14:57:50.000+03:00
diff --git a/app/code/Magento/Store/Model/StorageFactory.php b/app/code/Magento/Store/Model/StorageFactory.php
@@ -262,7 +262,7 @@ protected function _checkRequestStore(\Magento\Store\Model\StoreManagerInterface
     protected function getActiveStoreByCode(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode)
     {
         $stores = $storage->getStores(true, true);
-        if ($scopeCode && isset($stores[$scopeCode])
+        if (is_string($scopeCode) && isset($stores[$scopeCode])
             && $stores[$scopeCode]->getId()
             && $stores[$scopeCode]->getIsActive()
         ) {

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ protected function _checkRequestStore(\Magento\Store\Model\StoreManagerInterface`
`262`	`262`	`protected function getActiveStoreByCode(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode)`
`263`	`263`	`{`
`264`	`264`	`$stores = $storage->getStores(true, true);`
`265`		`- if ($scopeCode && isset($stores[$scopeCode])`
	`265`	`+ if (is_string($scopeCode) && isset($stores[$scopeCode])`
`266`	`266`	`&& $stores[$scopeCode]->getId()`
`267`	`267`	`&& $stores[$scopeCode]->getIsActive()`
`268`	`268`	`) {`