Forwardport of #11460 to 2.3-develop branch

serhii-balko · serhii-balko · commit f0af87edad79 · 2018-01-24T11:49:02.000+02:00
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;

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`namespace Magento\Store\App\Request;`
`7`	`7`
`8`	`8`	`use Magento\Framework\Exception\NoSuchEntityException;`
	`9`	`+use Magento\Store\Model\Store;`
`9`	`10`
`10`	`11`	`class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface`
`11`	`12`	`{`
`@@ -42,7 +43,7 @@ public function process(\Magento\Framework\App\RequestInterface $request, $pathI`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`if ($store->isUseStoreInUrl()) {`
`45`		`- if (!$request->isDirectAccessFrontendName($storeCode)) {`
	`46`	`+ if (!$request->isDirectAccessFrontendName($storeCode) && $storeCode != Store::ADMIN_CODE ) {`
`46`	`47`	`$this->storeManager->setCurrentStore($store->getCode());`
`47`	`48`	`$pathInfo = '/' . (isset($pathParts[1]) ? $pathParts[1] : '');`
`48`	`49`	`return $pathInfo;`