From f92758c7647ac75f316e1c8cadd8798e006e3be2 Mon Sep 17 00:00:00 2001
From: Stuart Williams <stuart@sidereal.ca>
Date: Wed, 16 Nov 2016 19:57:23 -0500
Subject: [PATCH] Replace only base URL in login redirect URL, fixes #5205

---
 src/controllers/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/index.js b/src/controllers/index.js
index 2671dc0657..a8cfa96d89 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -104,7 +104,7 @@ Controllers.login = function (req, res, next) {
 	var registrationType = meta.config.registrationType || 'normal';
 
 	var allowLoginWith = (meta.config.allowLoginWith || 'username-email');
-	var returnTo = (req.headers['x-return-to'] || '').replace(nconf.get('url'), '');
+	var returnTo = (req.headers['x-return-to'] || '').replace(nconf.get('base_url'), '');
 
 	var errorText;
 	if (req.query.error === 'csrf-invalid') {