Merge pull request #16 from drsdre/drsdre-previousUrl-patch

Prevent error when session has expired
akaunting · Nov 2, 2019 · d578be3 · d578be3
2 parents 9273cc8 + 2b5202e
commit d578be3
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Controllers/Language.php b/src/Controllers/Language.php
@@ -72,7 +72,10 @@ public function back($locale, Request $request)
 
             $session->setPreviousUrl($url);
         }
-
-        return redirect($session->previousUrl());
+        return redirect(
+            $session->previousUrl()
+            ? $session->previousUrl()
+            : (config('language.url') ? url('/' . $locale) : url('/'))
+        );
     }
 }