Merge remote-tracking branch 'upstream/master'

Conflicts:
	conf/app.ini

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index 37e3aec4..2bc05697 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -25,13 +25,13 @@ func Toggle(options *ToggleOptions) macaron.Handler {
 	return func(ctx *Context) {
 		// Cannot view any page before installation.
 		if !setting.InstallLock {
-			ctx.Redirect("/install")
+			ctx.Redirect(setting.AppSubUrl + "/install")
 			return
 		}
 
 		// Redirect to dashboard if user tries to visit any non-login page.
 		if options.SignOutRequire && ctx.IsSigned && ctx.Req.RequestURI != "/" {
-			ctx.Redirect("/")
+			ctx.Redirect(setting.AppSubUrl + "/")
 			return
 		}
 
@@ -48,12 +48,12 @@ func Toggle(options *ToggleOptions) macaron.Handler {
 				if strings.HasSuffix(ctx.Req.RequestURI, "watch") {
 					return
 				}
-				ctx.SetCookie("redirect_to", "/"+url.QueryEscape(ctx.Req.RequestURI))
-				ctx.Redirect("/user/login")
+				ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI), 0, setting.AppSubUrl)
+				ctx.Redirect(setting.AppSubUrl + "/user/login")
 				return
 			} else if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm {
 				ctx.Data["Title"] = ctx.Tr("auth.active_your_account")
-				ctx.HTML(200, "user/activate")
+				ctx.HTML(200, "user/auth/activate")
 				return
 			}
 		}