Also clean the clean from url

codedor · Dec 13, 2023 · 844a286 · 844a286
1 parent 290581a
commit 844a286
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/Http/Middleware/Redirects.php b/src/Http/Middleware/Redirects.php
@@ -38,15 +38,14 @@ public function handle(Request $request, Closure $next)
         ];
 
         $activeRedirect = $urlMaps->first(function ($redirect) use ($current) {
-            $hasWildcard = Str::contains(
-                $redirect->clean_from,
-                config('filament-redirects.route-wildcard', '*')
-            );
+            $from = $redirect->clean_from;
+
+            $hasWildcard = Str::contains($from, config('filament-redirects.route-wildcard', '*'));
 
             return
-                ($hasWildcard && Str::is($redirect->clean_from, $current['path'])) ||
-                ($hasWildcard && Str::is($redirect->clean_from, $current['full'])) ||
-                (in_array($redirect->clean_from, $current));
+                ($hasWildcard && Str::is($from, $current['path'])) ||
+                ($hasWildcard && Str::is($from, $current['full'])) ||
+                (in_array($from, $current));
         });
 
         if (! $activeRedirect) {

diff --git a/src/Models/Redirect.php b/src/Models/Redirect.php
@@ -48,11 +48,17 @@ protected static function boot()
 
     public function getCleanFromAttribute()
     {
-        return trim((
-            Str::startsWith($this->from, '/') || Str::startsWith($this->from, 'http')
-                ? ''
-                : '/'
-        ) . $this->from);
+        return Str::ascii(
+            urldecode(
+                trim(
+                    (
+                        Str::startsWith($this->from, '/') || Str::startsWith($this->from, 'http')
+                            ? ''
+                            : '/'
+                    ) . $this->from
+                )
+            )
+        );
     }
 
     /**