diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2020-01-29 15:47:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-29 09:47:46 +0200 |
| commit | 79ce91fddee549514c98f002b719fc8cda0e380f (patch) | |
| tree | 56271e8e73b238bfee415a64d73d1272c67fef3a /routers/admin | |
| parent | c09e020558318feebbdce477f91c94411e8959b6 (diff) | |
| download | gitea-79ce91fddee549514c98f002b719fc8cda0e380f.tar.gz gitea-79ce91fddee549514c98f002b719fc8cda0e380f.zip | |
Movde dependents on macaron from modules/setting (#10050)
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'routers/admin')
| -rw-r--r-- | routers/admin/admin.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 56e5d321b3..cd425271a3 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -319,7 +319,14 @@ func Config(ctx *context.Context) { if err := json.Unmarshal([]byte(sessionCfg.ProviderConfig), &realSession); err != nil { log.Error("Unable to unmarshall session config for virtualed provider config: %s\nError: %v", sessionCfg.ProviderConfig, err) } - sessionCfg = realSession + sessionCfg.Provider = realSession.Provider + sessionCfg.ProviderConfig = realSession.ProviderConfig + sessionCfg.CookieName = realSession.CookieName + sessionCfg.CookiePath = realSession.CookiePath + sessionCfg.Gclifetime = realSession.Gclifetime + sessionCfg.Maxlifetime = realSession.Maxlifetime + sessionCfg.Secure = realSession.Secure + sessionCfg.Domain = realSession.Domain } sessionCfg.ProviderConfig = shadowPassword(sessionCfg.Provider, sessionCfg.ProviderConfig) ctx.Data["SessionConfig"] = sessionCfg |