closes #5847

8 years ago · 4ac8d29f06
parent 0ecd2300b3
commit 4ac8d29f06
1 changed files with 7 additions and 1 deletions
--- a/src/middleware/user.js
+++ b/src/middleware/user.js
@ -166,7 +166,13 @@ module.exports = function (middleware) {
 					return next();
 				}

-				req.session.returnTo = req.path.replace(/^\/api/, '');
+				var returnTo = req.path;
+				if (nconf.get('relative_path')) {
+					returnTo = req.path.replace(new RegExp('^' + nconf.get('relative_path')), '');
+				}
+				returnTo = returnTo.replace(/^\/api/, '');
+
+				req.session.returnTo = nconf.get('relative_path') + returnTo;
 				req.session.forceLogin = 1;
 				if (res.locals.isAPI) {
 					res.status(401).json({});