From 17dfffefb368b167cfbad9b6c48e59e8bc952691 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 15 Apr 2016 19:33:25 +0200 Subject: Keep used username in URL This is required until the new controller can also handle POST requests --- lib/base.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/base.php b/lib/base.php index d8ef17e42ed..818e13fbef2 100644 --- a/lib/base.php +++ b/lib/base.php @@ -954,7 +954,14 @@ class OC { if(!\OC::$server->getUserSession()->isLoggedIn()) { $loginMessages = array(array_unique($error), $messages); \OC::$server->getSession()->set('loginMessages', $loginMessages); - header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute('core.login.showLoginForm')); + // Read current user and append if possible + $args = []; + if(isset($_POST['user'])) { + $args['user'] = $_POST['user']; + } + + $redirectionTarget = \OC::$server->getURLGenerator()->linkToRoute('core.login.showLoginForm', $args); + header('Location: ' . $redirectionTarget); } } -- cgit v1.2.3