release/v1.15
Lunny Xiao 2021-01-14 23:35:10 +08:00 committed by GitHub
parent edbc5c86df
commit f76c30094f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -95,7 +95,7 @@ func (s *SSPI) VerifyAuthData(req *http.Request, w http.ResponseWriter, store Da
// to login with another authentication method if SSPI authentication // to login with another authentication method if SSPI authentication
// fails // fails
store.GetData()["Flash"] = map[string]string{ store.GetData()["Flash"] = map[string]string{
"ErrMsg": err.Error(), "ErrorMsg": err.Error(),
} }
store.GetData()["EnableOpenIDSignIn"] = setting.Service.EnableOpenIDSignIn store.GetData()["EnableOpenIDSignIn"] = setting.Service.EnableOpenIDSignIn
store.GetData()["EnableSSPI"] = true store.GetData()["EnableSSPI"] = true

View File

@ -95,7 +95,7 @@ func Recovery() func(next http.Handler) http.Handler {
w.Header().Set(`X-Frame-Options`, `SAMEORIGIN`) w.Header().Set(`X-Frame-Options`, `SAMEORIGIN`)
if setting.RunMode != "prod" { if setting.RunMode != "prod" {
store.Data["ErrMsg"] = combinedErr store.Data["ErrorMsg"] = combinedErr
} }
err = rnd.HTML(w, 500, "status/500", templates.BaseVars().Merge(store.Data)) err = rnd.HTML(w, 500, "status/500", templates.BaseVars().Merge(store.Data))
if err != nil { if err != nil {