Merge branch 'fix-wrong-redirect' into '1.x'

fix: IPET-417 check if parameter is empty See merge request magesuite/seo-link-masking!31
magesuite · Oct 20, 2021 · 817bcd5 · 817bcd5
2 parents 36a2f4b + a642d65
commit 817bcd5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Controller/Router.php b/Controller/Router.php
@@ -49,7 +49,7 @@ public function match(\Magento\Framework\App\RequestInterface $request)
             return null;
         }
 
-        $requestedUrl = ltrim($request->getPathInfo(), '/');
+        $requestedUrl = trim($request->getPathInfo(), '/');
         $rewrite = $this->urlRewriteFinder->findRewrite($requestedUrl);
 
         if (empty($rewrite)) {

diff --git a/Model/FilterParametersProcessor.php b/Model/FilterParametersProcessor.php
@@ -91,6 +91,10 @@ public function toUrl($filterParameters){
 
     protected function prepareParameter($parameter, $options)
     {
+        if (empty($parameter)) {
+            return null;
+        }
+
         if (strpos($parameter, $this->configuration->getMultiselectOptionSeparator()) === false) {
             if (!isset($options[$parameter])) {
                 if($this->configuration->isUtfFriendlyModeEnabled()) {