Skip to content

Commit

Permalink
Fix read system configuration bug when installing (#21489)
Browse files Browse the repository at this point in the history
Fix #18058 (comment)

Co-authored-by: 6543 <6543@obermui.de>
  • Loading branch information
lunny and 6543 authored Oct 18, 2022
1 parent 20a5452 commit f0182d8
Showing 1 changed file with 5 additions and 13 deletions.
18 changes: 5 additions & 13 deletions routers/install/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,19 +149,9 @@ func Install(ctx *context.Context) {

// Server and other services settings
form.OfflineMode = setting.OfflineMode
disableGravatarSetting, _ := system_model.GetSetting(system_model.KeyPictureDisableGravatar)
if disableGravatarSetting != nil {
form.DisableGravatar = disableGravatarSetting.GetValueBool()
} else {
form.DisableGravatar = false
}
form.DisableGravatar = false // when installing, there is no database connection so that given a default value
form.EnableFederatedAvatar = false // when installing, there is no database connection so that given a default value

enableFederatedAvatarSetting, _ := system_model.GetSetting(system_model.KeyPictureEnableFederatedAvatar)
if enableFederatedAvatarSetting != nil {
form.EnableFederatedAvatar = enableFederatedAvatarSetting.GetValueBool()
} else {
form.EnableFederatedAvatar = false
}
form.EnableOpenIDSignIn = setting.Service.EnableOpenIDSignIn
form.EnableOpenIDSignUp = setting.Service.EnableOpenIDSignUp
form.DisableRegistration = setting.Service.DisableRegistration
Expand Down Expand Up @@ -385,7 +375,6 @@ func SubmitInstall(ctx *context.Context) {
ctx.RenderWithErr(ctx.Tr("install.invalid_db_setting", err), tplInstall, &form)
return
}
db.UnsetDefaultEngine()

// Save settings.
cfg := ini.Empty()
Expand Down Expand Up @@ -518,6 +507,9 @@ func SubmitInstall(ctx *context.Context) {
return
}

// unset default engine before reload database setting
db.UnsetDefaultEngine()

// ---- All checks are passed

// Reload settings (and re-initialize database connection)
Expand Down

0 comments on commit f0182d8

Please sign in to comment.