Shiloh/githaven
Shiloh/githaven
1
0
Fork 1
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix read system configuration bug when installing (#21489)

Browse Source 
Fix https://github.com/go-gitea/gitea/pull/18058#issuecomment-1280944311

Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
Lunny Xiao 2022-10-18 23:16:58 +08:00 committed by GitHub
parent 20a5452ea6
commit f0182d8840
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
routers/install/install.go
View File

@ -149,19 +149,9 @@ func Install(ctx *context.Context) {
// Server and other services settings // Server and other services settings
form.OfflineMode = setting.OfflineMode form.OfflineMode = setting.OfflineMode
disableGravatarSetting, _ := system_model.GetSetting(system_model.KeyPictureDisableGravatar) form.DisableGravatar = false // when installing, there is no database connection so that given a default value
if disableGravatarSetting != nil { form.EnableFederatedAvatar = false // when installing, there is no database connection so that given a default value
form.DisableGravatar = disableGravatarSetting.GetValueBool()
} else {
form.DisableGravatar = false
}
enableFederatedAvatarSetting, _ := system_model.GetSetting(system_model.KeyPictureEnableFederatedAvatar)
if enableFederatedAvatarSetting != nil {
form.EnableFederatedAvatar = enableFederatedAvatarSetting.GetValueBool()
} else {
form.EnableFederatedAvatar = false
}
form.EnableOpenIDSignIn = setting.Service.EnableOpenIDSignIn form.EnableOpenIDSignIn = setting.Service.EnableOpenIDSignIn
form.EnableOpenIDSignUp = setting.Service.EnableOpenIDSignUp form.EnableOpenIDSignUp = setting.Service.EnableOpenIDSignUp
form.DisableRegistration = setting.Service.DisableRegistration 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) ctx.RenderWithErr(ctx.Tr("install.invalid_db_setting", err), tplInstall, &form)
return return
} }
db.UnsetDefaultEngine()
// Save settings. // Save settings.
cfg := ini.Empty() cfg := ini.Empty()
@ -518,6 +507,9 @@ func SubmitInstall(ctx *context.Context) {
return return
} }
// unset default engine before reload database setting
db.UnsetDefaultEngine()
// ---- All checks are passed // ---- All checks are passed
// Reload settings (and re-initialize database connection) // Reload settings (and re-initialize database connection)