mirror of
https://github.com/go-gitea/gitea.git
synced 2024-09-05 23:34:19 -04:00
Fix read system configuration bug when installing (#21489)
Fix https://github.com/go-gitea/gitea/pull/18058#issuecomment-1280944311 Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
parent
20a5452ea6
commit
f0182d8840
@ -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
|
||||
@ -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()
|
||||
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user