minor fix on auto sign in

release/v1.15
Unknwon 2015-11-19 00:22:16 -05:00
parent 481be9b5c9
commit ee686f6231
1 changed files with 2 additions and 2 deletions

View File

@ -110,13 +110,13 @@ func Toggle(options *ToggleOptions) macaron.Handler {
}
// Try auto-signin when not signed in.
if !ctx.IsSigned {
if !options.SignOutRequire && !ctx.IsSigned && !auth.IsAPIPath(ctx.Req.URL.Path) {
succeed, err := AutoSignIn(ctx)
if err != nil {
ctx.Handle(500, "AutoSignIn", err)
return
} else if succeed {
ctx.Redirect(ctx.Req.URL.Path)
ctx.Redirect(setting.AppSubUrl + ctx.Req.RequestURI)
return
}
}