Fixed #17147

[ci skip]

Author: brandonkelly

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Fixed a bug where static relational field inputs weren’t showing the related elements’ hierarchy. ([#17127](https://github.com/craftcms/cms/issues/17127))
 - Fixed a bug where some system screens shown on the front end were sent without no-cache headers. ([#17129](https://github.com/craftcms/cms/issues/17129))
 - Fixed a bug where the default `notificationDuration` value per the `accessibilityDefaults` config setting wasn’t being respected for users who hadn’t saved their preferences yet.
+- Fixed a bug where control panel JavaScript-generated URLs weren’t formatted correctly if the `omitScriptNameInUrls` and `usePathInfo` config settings were both disabled. ([#17147](https://github.com/craftcms/cms/issues/17147))
 
 ## 4.15.0.2 - 2025-04-17
 

src/web/assets/cp/dist/cp.js

@@ -451,7 +451,9 @@ $.extend(Craft, {
     if (path.search('://') !== -1 || path[0] === '/') {
       return (
         path +
-        (!$.isEmptyObject(params) ? `?${$.param(params)}` : '') +
+        (!$.isEmptyObject(params)
+          ? `?${decodeURIComponent($.param(params))}`
+          : '') +
         (anchor ? `#${anchor}` : '')
       );
     }
@@ -483,14 +485,13 @@ $.extend(Craft, {
 
     // Does the base URL already have a query string?
     qsPos = url.indexOf('?');
+    let baseParams;
     if (qsPos !== -1) {
-      params = $.extend(
-        Object.fromEntries(
-          new URLSearchParams(url.substring(qsPos + 1)).entries()
-        ),
-        params
+      baseParams = Object.fromEntries(
+        new URLSearchParams(url.substring(qsPos + 1)).entries()
       );
       url = url.substring(0, qsPos);
+      params = Object.assign({}, baseParams, params);
     }
 
     if (!Craft.omitScriptNameInUrls && path) {
@@ -501,13 +502,10 @@ $.extend(Craft, {
         }
       } else {
         // Move the path into the query string params
-
-        // Is the path param already set?
-        if (typeof params[Craft.pathParam] !== 'undefined') {
-          let basePath = params[Craft.pathParam].trimEnd();
-          path = basePath + (path ? '/' + path : '');
+        if (baseParams && baseParams[Craft.pathParam] !== undefined) {
+          path =
+            baseParams[Craft.pathParam].trimEnd() + (path ? '/' + path : '');
         }
-
         params[Craft.pathParam] = path;
         path = null;
       }
@@ -518,7 +516,7 @@ $.extend(Craft, {
     }
 
     if (!$.isEmptyObject(params)) {
-      url += `?${$.param(params)}`;
+      url += `?${decodeURIComponent($.param(params))}`;
     }
 
     if (anchor) {
@@ -635,7 +633,7 @@ $.extend(Craft, {
       if (document.location.search) {
         const params = Object.fromEntries(new URLSearchParams(qs).entries());
         delete params[pageParam];
-        qs = $.param(params);
+        qs = decodeURIComponent($.param(params));
       }
       if (page !== 1) {
         qs += (qs !== '' ? '&' : '') + `${pageParam}=${page}`;