diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-11-10 14:43:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-10 14:43:53 +0800 |
| commit | 385462d36c75e809ee082d3432941f938cbdffc9 (patch) | |
| tree | 938946297d1c0fa736852e1054f732ed2b0db686 /models/avatars | |
| parent | ce5aafbc698de72d8acf03851dc5db057b3cc01f (diff) | |
| download | gitea-385462d36c75e809ee082d3432941f938cbdffc9.tar.gz gitea-385462d36c75e809ee082d3432941f938cbdffc9.zip | |
Fix dashboard ignored system setting cache (#21621)
This is a performance regression from #18058
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'models/avatars')
| -rw-r--r-- | models/avatars/avatar.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/models/avatars/avatar.go b/models/avatars/avatar.go index 418e9b9ccc..ec3b611312 100644 --- a/models/avatars/avatar.go +++ b/models/avatars/avatar.go @@ -150,10 +150,11 @@ func generateEmailAvatarLink(email string, size int, final bool) string { return DefaultAvatarLink() } - enableFederatedAvatar, _ := system_model.GetSetting(system_model.KeyPictureEnableFederatedAvatar) + enableFederatedAvatarSetting, _ := system_model.GetSetting(system_model.KeyPictureEnableFederatedAvatar) + enableFederatedAvatar := enableFederatedAvatarSetting.GetValueBool() var err error - if enableFederatedAvatar != nil && enableFederatedAvatar.GetValueBool() && system_model.LibravatarService != nil { + if enableFederatedAvatar && system_model.LibravatarService != nil { emailHash := saveEmailHash(email) if final { // for final link, we can spend more time on slow external query @@ -171,8 +172,10 @@ func generateEmailAvatarLink(email string, size int, final bool) string { return urlStr } - disableGravatar, _ := system_model.GetSetting(system_model.KeyPictureDisableGravatar) - if disableGravatar != nil && !disableGravatar.GetValueBool() { + disableGravatarSetting, _ := system_model.GetSetting(system_model.KeyPictureDisableGravatar) + + disableGravatar := disableGravatarSetting.GetValueBool() + if !disableGravatar { // copy GravatarSourceURL, because we will modify its Path. avatarURLCopy := *system_model.GravatarSourceURL avatarURLCopy.Path = path.Join(avatarURLCopy.Path, HashEmail(email)) |