Resolve #5118 "Endlos-Redirect beim Öffnen von Bookmark-Links"

Closes #5118

Merge request studip/studip!3838

2 files changed, 2 insertions, 1 deletions

diff --git a/app/controllers/login.php b/app/controllers/login.php
index ad2cf84..31414dc 100644
--- a/app/controllers/login.php
+++ b/app/controllers/login.php
@@ -18,6 +18,7 @@ class LoginController extends AuthenticatedController
     public function __construct(\Trails\Dispatcher $dispatcher)
     {
         Config::get()->USER_VISIBILITY_CHECK = false;
+        Request::set('cid', null);
         parent::__construct($dispatcher);
     }
 
diff --git a/lib/middleware/SeminarOpenMiddleware.php b/lib/middleware/SeminarOpenMiddleware.php
index 82919fe..617b801 100644
--- a/lib/middleware/SeminarOpenMiddleware.php
+++ b/lib/middleware/SeminarOpenMiddleware.php
@@ -159,7 +159,7 @@ final class SeminarOpenMiddleware implements MiddlewareInterface
             } catch (\LoginException $e) {
                 $response = $this->response_factory->createResponse(302);
                 $_SESSION['redirect_after_login'] = \Request::url();
-                return $response->withHeader('Location', \URLHelper::getURL('dispatch.php/login'));
+                return $response->withHeader('Location', \URLHelper::getScriptURL('dispatch.php/login'));
             }
             unset($course_id);
         }