Merge pull request #2470 in SW/shopware from bugfix/next/sw-11065-fix-multiple-virtual-url-replacement to next

* commit '80b987bebfefb5bafa5379a7b5b8e54adec31313':
  SW-11065 - Fix url replacement in router plugin

Author: bcremer

engine/Shopware/Plugins/Default/Core/Router/Bootstrap.php

@@ -201,16 +201,12 @@ private function removeShopBaseUrl($requestUri, Request $request, Shop $shop)
      */
     private function removePartOfUrl($requestUri, $url)
     {
-        $decode = urldecode($url);
-        $encode = urlencode($decode);
-
+        $temp = rtrim($url, '/') . '/';
         switch (true) {
-            case (strpos($requestUri, $url) === 0):
+            case (strpos($requestUri, $temp) === 0):
+                return substr($requestUri, strlen($url));
+            case ($requestUri == $url):
                 return substr($requestUri, strlen($url));
-            case (strpos($requestUri, $decode) === 0):
-                return substr($requestUri, strlen($decode));
-            case (strpos($requestUri, $encode) === 0):
-                return substr($requestUri, strlen($encode));
             default:
                 return $requestUri;
         }