Skip to content

Commit d168653

Browse files
author
Michail Slabko
committed
MAGETWO-34192: [GITHUB] Lost catalog rewrite url after page/list-mode/limit changed #1042
1 parent 068d068 commit d168653

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

app/code/Magento/UrlRewrite/Controller/Router.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public function match(\Magento\Framework\App\RequestInterface $request)
8585
return $this->processRedirect($request, $rewrite);
8686
}
8787

88+
$request->setAlias(\Magento\Framework\UrlInterface::REWRITE_REQUEST_PATH_ALIAS, $rewrite->getRequestPath());
8889
$request->setPathInfo('/' . $rewrite->getTargetPath());
8990
return $this->actionFactory->create('Magento\Framework\App\Action\Forward', ['request' => $request]);
9091
}

dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,11 @@ public function testMatch()
252252
->disableOriginalConstructor()->getMock();
253253
$urlRewrite->expects($this->any())->method('getRedirectType')->will($this->returnValue(0));
254254
$urlRewrite->expects($this->any())->method('getTargetPath')->will($this->returnValue('target-path'));
255+
$urlRewrite->expects($this->any())->method('getRequestPath')->will($this->returnValue('request-path'));
255256
$this->urlFinder->expects($this->any())->method('findOneByData')->will($this->returnValue($urlRewrite));
256257
$this->request->expects($this->once())->method('setPathInfo')->with('/target-path');
258+
$this->request->expects($this->once())->method('setAlias')
259+
->with(\Magento\Framework\UrlInterface::REWRITE_REQUEST_PATH_ALIAS, 'request-path');
257260
$this->actionFactory->expects($this->once())->method('create')
258261
->with('Magento\Framework\App\Action\Forward', ['request' => $this->request]);
259262

0 commit comments

Comments
 (0)