diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-11-29 17:21:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-29 17:21:43 +0100 |
commit | d86b29b42b93ba535b242bd8949fcf3fee52ce1e (patch) | |
tree | 3ac660f453e7f67eedad1af4947e0aa9e1889bdd /lib/private | |
parent | 7780e45348e9a45f081bb199e4679d69e0b5336c (diff) | |
parent | 0ebffa4a5fb8f3fe1f220fd4c5bf3897a45557dd (diff) | |
download | nextcloud-server-d86b29b42b93ba535b242bd8949fcf3fee52ce1e.tar.gz nextcloud-server-d86b29b42b93ba535b242bd8949fcf3fee52ce1e.zip |
Merge pull request #2066 from nextcloud/fix-redirect-double-encoding
do not double encode the redirect url
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php | 2 | ||||
-rw-r--r-- | lib/private/legacy/util.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php index d5f7a7660a7..d60d5749d57 100644 --- a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php +++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php @@ -250,7 +250,7 @@ class SecurityMiddleware extends Middleware { $url = $this->urlGenerator->linkToRoute( 'core.login.showLoginForm', [ - 'redirect_url' => urlencode($this->request->server['REQUEST_URI']), + 'redirect_url' => $this->request->server['REQUEST_URI'], ] ); $response = new RedirectResponse($url); diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php index b3014ed09f3..eaa82ec8701 100644 --- a/lib/private/legacy/util.php +++ b/lib/private/legacy/util.php @@ -975,7 +975,7 @@ class OC_Util { header('Location: ' . \OC::$server->getURLGenerator()->linkToRoute( 'core.login.showLoginForm', [ - 'redirect_url' => urlencode(\OC::$server->getRequest()->getRequestUri()), + 'redirect_url' => \OC::$server->getRequest()->getRequestUri(), ] ) ); |