Skip to content

Commit c406b84

Browse files
committed
Allow from to include folders by it not being a slug :)
1 parent f519311 commit c406b84

2 files changed

Lines changed: 17 additions & 9 deletions

File tree

resources/blueprints/redirects.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ sections:
1111
validate:
1212
- required
1313
-
14-
handle: slug
14+
handle: from
1515
field:
16-
type: slug
17-
required: true
18-
localizable: true
19-
validate:
20-
- required
16+
input_type: text
17+
antlers: false
2118
display: From
19+
type: text
20+
icon: text
2221
listable: hidden
23-
generate: true
22+
validate:
23+
- required
2424
-
2525
handle: to
2626
field:

src/Http/Middleware/RedirectsMiddleware.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,16 @@ public function handle($request, Closure $next, ...$guards)
1414

1515
$redirect = Entry::findByUri('/redirects/'.$url);
1616

17-
if (!$redirect)
18-
return $next($request);
17+
if (!$redirect) {
18+
19+
$redirect = Entry::whereCollection('redirects')
20+
->where('from', '/redirects/'.$url)
21+
->first();
22+
23+
if (!$redirect)
24+
return $next($request);
25+
26+
}
1927

2028
return redirect($redirect->to, $redirect->code ?? 302);
2129
}

0 commit comments

Comments
 (0)