@@ -148,8 +148,8 @@ func Install(ctx *context.Context) {
148
148
149
149
// Server and other services settings
150
150
form .OfflineMode = setting .OfflineMode
151
- form .DisableGravatar = false // when installing, there is no database connection so that given a default value
152
- form .EnableFederatedAvatar = false // when installing, there is no database connection so that given a default value
151
+ form .DisableGravatar = setting . DisableGravatar // when installing, there is no database connection so that given a default value
152
+ form .EnableFederatedAvatar = setting . EnableFederatedAvatar // when installing, there is no database connection so that given a default value
153
153
154
154
form .EnableOpenIDSignIn = setting .Service .EnableOpenIDSignIn
155
155
form .EnableOpenIDSignUp = setting .Service .EnableOpenIDSignUp
@@ -442,10 +442,13 @@ func SubmitInstall(ctx *context.Context) {
442
442
cfg .Section ("server" ).Key ("OFFLINE_MODE" ).SetValue (fmt .Sprint (form .OfflineMode ))
443
443
// if you are reinstalling, this maybe not right because of missing version
444
444
if err := system_model .SetSettingNoVersion (system_model .KeyPictureDisableGravatar , strconv .FormatBool (form .DisableGravatar )); err != nil {
445
- ctx .RenderWithErr (ctx .Tr ("install.secret_key_failed" , err ), tplInstall , & form )
445
+ ctx .RenderWithErr (ctx .Tr ("install.save_config_failed" , err ), tplInstall , & form )
446
+ return
447
+ }
448
+ if err := system_model .SetSettingNoVersion (system_model .KeyPictureEnableFederatedAvatar , strconv .FormatBool (form .EnableFederatedAvatar )); err != nil {
449
+ ctx .RenderWithErr (ctx .Tr ("install.save_config_failed" , err ), tplInstall , & form )
446
450
return
447
451
}
448
- cfg .Section ("picture" ).Key ("ENABLE_FEDERATED_AVATAR" ).SetValue (fmt .Sprint (form .EnableFederatedAvatar ))
449
452
cfg .Section ("openid" ).Key ("ENABLE_OPENID_SIGNIN" ).SetValue (fmt .Sprint (form .EnableOpenIDSignIn ))
450
453
cfg .Section ("openid" ).Key ("ENABLE_OPENID_SIGNUP" ).SetValue (fmt .Sprint (form .EnableOpenIDSignUp ))
451
454
cfg .Section ("service" ).Key ("DISABLE_REGISTRATION" ).SetValue (fmt .Sprint (form .DisableRegistration ))
0 commit comments