Merge f582f11 into c0dc87f

arbory · Jul 12, 2019 · 16d70d5 · 16d70d5
2 parents c0dc87f + f582f11
commit 16d70d5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Http/Middleware/ArboryRouteRedirectMiddleware.php b/src/Http/Middleware/ArboryRouteRedirectMiddleware.php
@@ -20,9 +20,9 @@ public function handle($request, Closure $next)
     {
         $redirect = Redirect::query();
 
-        $redirect->where('from_url', $request->url());
+        $redirect->whereIn('from_url', [$request->url(), $request->path()]);
         $redirect->orWhere('from_url', 'LIKE', '_'.$request->path().'_');
-
+        
         $redirect = $redirect->first(['to_url']);
 
         if ($redirect) {