Limit slash decoding to last param again

tighten · Aug 18, 2023 · e26df66 · e26df66
1 parent 32568e1
commit e26df66
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/js/Route.js b/src/js/Route.js
@@ -114,7 +114,9 @@ export default class Route {
                     throw new Error(`Ziggy error: '${segment}' parameter does not match required format '${this.wheres[segment]}' for route '${this.name}'.`)
                 }
 
-                return encodeURIComponent(params[segment] ?? '').replace(/%2F/g, '/');
+                if (segments[segments.length - 1].name === segment) {
+                    return encodeURIComponent(params[segment] ?? '').replace(/%2F/g, '/');
+                }
             }
 
             return encodeURIComponent(params[segment] ?? '');

diff --git a/tests/js/route.test.js b/tests/js/route.test.js
@@ -647,7 +647,7 @@ describe('route()', () => {
         same(route('slashesOtherRegex', ['one/two/three', 'Fun&Games/venues/outdoors']), 'https://ziggy.dev/slashes/one%2Ftwo%2Fthree/Fun%26Games/venues/outdoors');
     });
 
-    test('skip encoding slashes inside middle parameter when explicitly allowed', () => {
+    test.skip('skip encoding slashes inside middle parameter when explicitly allowed', () => {
         same(route('slashesMiddleParam', ['one/two', 'three/four']), 'https://ziggy.dev/slashes/one/two/three/four');
         same(route('slashesMiddleParam', ['one/two', 'Fun&Games/venues']), 'https://ziggy.dev/slashes/one/two/Fun%26Games/venues');
         same(route('slashesMiddleParam', ['one/two/three', 'Fun&Games/venues/outdoors']), 'https://ziggy.dev/slashes/one/two/three/Fun%26Games/venues/outdoors');