Merge remote-tracking branch 'origin/master' into 0.7.0

10 years ago · f8a03c4fca
parent ea3d7d610a 22a619d9c7
commit f8a03c4fca
1 changed files with 1 additions and 1 deletions
--- a/src/middleware/middleware.js
+++ b/src/middleware/middleware.js
@ -69,7 +69,7 @@ middleware.redirectToAccountIfLoggedIn = function(req, res, next) {

 middleware.redirectToLoginIfGuest = function(req, res, next) {
 	if (!req.user || parseInt(req.user.uid, 10) === 0) {
-		req.session.returnTo = nconf.get('relative_path') + req.url;
+		req.session.returnTo = nconf.get('relative_path') + req.url.replace(/^\/api/, '');
 		return res.redirect(nconf.get('relative_path') + '/login');
 	} else {
 		next();