Skip to content

Commit

Permalink
Task: swapping MasterRequest with MainRequest
Browse files Browse the repository at this point in the history
  • Loading branch information
kingjia90 authored and dvesh3 committed Sep 12, 2022
1 parent dafa06b commit 4960fe6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Website/Tool/PimcoreUrl.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class PimcoreUrl extends \Pimcore\Twig\Extension\Templating\PimcoreUrl
public function __invoke(array $urlOptions = [], $name = null, $reset = false, $encode = true, $relative = false)
{
// merge all parameters from request to parameters
if (!$reset && $this->requestHelper->hasMasterRequest()) {
$urlOptions = array_replace($this->requestHelper->getMasterRequest()->attributes->get('_route_params'), $urlOptions);
if (!$reset && $this->requestHelper->hasMainRequest()) {
$urlOptions = array_replace($this->requestHelper->getMainRequest()->attributes->get('_route_params'), $urlOptions);
}

return parent::__invoke($urlOptions, $name, $reset, $encode, $relative);
Expand Down

0 comments on commit 4960fe6

Please sign in to comment.