@@ -149,19 +149,9 @@ func Install(ctx *context.Context) {
149
149
150
150
// Server and other services settings
151
151
form .OfflineMode = setting .OfflineMode
152
- disableGravatarSetting , _ := system_model .GetSetting (system_model .KeyPictureDisableGravatar )
153
- if disableGravatarSetting != nil {
154
- form .DisableGravatar = disableGravatarSetting .GetValueBool ()
155
- } else {
156
- form .DisableGravatar = false
157
- }
152
+ form .DisableGravatar = false // when installing, there is no database connection so that given a default value
153
+ form .EnableFederatedAvatar = false // when installing, there is no database connection so that given a default value
158
154
159
- enableFederatedAvatarSetting , _ := system_model .GetSetting (system_model .KeyPictureEnableFederatedAvatar )
160
- if enableFederatedAvatarSetting != nil {
161
- form .EnableFederatedAvatar = enableFederatedAvatarSetting .GetValueBool ()
162
- } else {
163
- form .EnableFederatedAvatar = false
164
- }
165
155
form .EnableOpenIDSignIn = setting .Service .EnableOpenIDSignIn
166
156
form .EnableOpenIDSignUp = setting .Service .EnableOpenIDSignUp
167
157
form .DisableRegistration = setting .Service .DisableRegistration
@@ -385,7 +375,6 @@ func SubmitInstall(ctx *context.Context) {
385
375
ctx .RenderWithErr (ctx .Tr ("install.invalid_db_setting" , err ), tplInstall , & form )
386
376
return
387
377
}
388
- db .UnsetDefaultEngine ()
389
378
390
379
// Save settings.
391
380
cfg := ini .Empty ()
@@ -518,6 +507,9 @@ func SubmitInstall(ctx *context.Context) {
518
507
return
519
508
}
520
509
510
+ // unset default engine before reload database setting
511
+ db .UnsetDefaultEngine ()
512
+
521
513
// ---- All checks are passed
522
514
523
515
// Reload settings (and re-initialize database connection)
0 commit comments