Forwardport of #11460 to 2.3-develop branch

magento · Jan 24, 2018 · f0af87e · f0af87e
1 parent 8e77e2f
commit f0af87e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
@@ -6,6 +6,7 @@
 namespace Magento\Store\App\Request;
 
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\Store;
 
 class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface
 {
@@ -42,7 +43,7 @@ public function process(\Magento\Framework\App\RequestInterface $request, $pathI
  }
 
  if ($store->isUseStoreInUrl()) {
- if (!$request->isDirectAccessFrontendName($storeCode)) {
+ if (!$request->isDirectAccessFrontendName($storeCode) && $storeCode != Store::ADMIN_CODE ) {
  $this->storeManager->setCurrentStore($store->getCode());
  $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
  return $pathInfo;