diff options
| author | lunnyxiao <xiaolunwen@gmail.com> | 2014-09-22 10:45:20 +0800 |
|---|---|---|
| committer | lunnyxiao <xiaolunwen@gmail.com> | 2014-09-22 10:45:20 +0800 |
| commit | 79ec08141af6f156597064f5fcafc4d0af2e1a05 (patch) | |
| tree | a4bc8452565eb2ac1fe2b432b1616c03572db7da /modules/middleware | |
| parent | 150eef93b2340f665c070158ade1863339829e05 (diff) | |
| parent | 1273b3d3a985e0aeb88c632e27d0e8dbc8dd2e19 (diff) | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'modules/middleware')
| -rw-r--r-- | modules/middleware/auth.go | 2 | ||||
| -rw-r--r-- | modules/middleware/repo.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go index 8fae5d1e..2bc05697 100644 --- a/modules/middleware/auth.go +++ b/modules/middleware/auth.go @@ -48,7 +48,7 @@ func Toggle(options *ToggleOptions) macaron.Handler { if strings.HasSuffix(ctx.Req.RequestURI, "watch") { return } - ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI)) + 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 { diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index 79b01133..f17018dd 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -298,7 +298,7 @@ func RequireTrueOwner() macaron.Handler { return func(ctx *Context) { if !ctx.Repo.IsTrueOwner && !ctx.Repo.IsAdmin { if !ctx.IsSigned { - ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI)) + ctx.SetCookie("redirect_to", "/"+url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI), 0, setting.AppSubUrl) ctx.Redirect(setting.AppSubUrl + "/user/login") return } |