From 4960fe64319669588024ad37dc9eb0f06cfdff1e Mon Sep 17 00:00:00 2001
From: JiaJia Ji <kingjia90@gmail.com>
Date: Tue, 6 Sep 2022 18:02:04 +0200
Subject: [PATCH] Task: swapping MasterRequest with MainRequest

---
 src/Website/Tool/PimcoreUrl.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Website/Tool/PimcoreUrl.php b/src/Website/Tool/PimcoreUrl.php
index de8f059d..9bad0d36 100644
--- a/src/Website/Tool/PimcoreUrl.php
+++ b/src/Website/Tool/PimcoreUrl.php
@@ -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);