Skip store code admin from being detected in case of store code in ur…

…l configured
magento · Jul 28, 2018 · c5d85e0 · c5d85e0
1 parent f06f52c
commit c5d85e0
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($storeCode);
  $pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');
  return $pathInfo;