From afa501e75b481651b7b520f449bb768dc5949ddc Mon Sep 17 00:00:00 2001
From: Daniel Seiler <daniel.seiler@fachschaft.informatik.tu-darmstadt.de>
Date: Sat, 14 Dec 2019 08:16:48 +0100
Subject: [PATCH] Recall previous route when manually clicking login

---
 app/Http/Controllers/Auth/LoginController.php | 4 ++++
 resources/views/common/header.blade.php       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index b1d22d57e..639da6699 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -128,6 +128,10 @@ class LoginController extends Controller
             ]);
         }
 
+        if ($request->has('intended')) {
+            redirect()->setIntendedUrl($request->get('intended'));
+        }
+
         return view('auth.login', [
           'socialDrivers' => $socialDrivers,
           'authMethod' => $authMethod,
diff --git a/resources/views/common/header.blade.php b/resources/views/common/header.blade.php
index 192996950..2d3871ba0 100644
--- a/resources/views/common/header.blade.php
+++ b/resources/views/common/header.blade.php
@@ -45,7 +45,7 @@
                         @if(setting('registration-enabled', false))
                             <a href="{{ url('/register') }}">@icon('new-user') {{ trans('auth.sign_up') }}</a>
                         @endif
-                        <a href="{{ url('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a>
+                        <a href="{{ action('Auth\LoginController@getLogin', ['intended' => url()->current()]) }}">@icon('login') {{ trans('auth.log_in') }}</a>
                     @endif
                 </div>
                 @if(signedInUser())