fix: Fixed an issue where a trailing slash would be added to a pagina…

…ted URL that uses URL parameters and `addTrailingSlashesToUrls` was `true` in the General config ([#1401](#1401))
nystudio107 · Feb 21, 2024 · 2a90464 · 2a90464
1 parent 2e33c68
commit 2a90464
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/helpers/UrlHelper.php b/src/helpers/UrlHelper.php
@@ -50,7 +50,7 @@ public static function siteUrl(string $path = '', $params = null, string $scheme
             $url = self::mergeUrlWithPath($siteUrl, $path);
             // Handle trailing slashes properly for generated URLs
             $generalConfig = Craft::$app->getConfig()->getGeneral();
-            if ($generalConfig->addTrailingSlashesToUrls && !preg_match('/\.[^\/]+$/', $url)) {
+            if ($generalConfig->addTrailingSlashesToUrls && !preg_match('/(.+\?.*)|(\.[^\/]+$)/', $url)) {
                 $url = rtrim($url, '/') . '/';
             }
             if (!$generalConfig->addTrailingSlashesToUrls) {
@@ -151,7 +151,7 @@ public static function absoluteUrlWithProtocol($url): string
 
         // Handle trailing slashes properly for generated URLs
         $generalConfig = Craft::$app->getConfig()->getGeneral();
-        if ($generalConfig->addTrailingSlashesToUrls && !preg_match('/\.[^\/]+$/', $url)) {
+        if ($generalConfig->addTrailingSlashesToUrls && !preg_match('/(.+\?.*)|(\.[^\/]+$)/', $url)) {
             $url = rtrim($url, '/') . '/';
         }
         if (!$generalConfig->addTrailingSlashesToUrls) {