diff options
| author | Andrew Burns <ErebusBat@gmail.com> | 2014-12-05 11:02:59 -0700 |
|---|---|---|
| committer | Andrew Burns <ErebusBat@gmail.com> | 2014-12-05 11:02:59 -0700 |
| commit | 35b02997f8599c8e260b70bc5b3239b0109c05cf (patch) | |
| tree | 9b3d691af9b480f13af4485111a6583e5ec85333 /modules | |
| parent | adc1ac689efb23c6de2a22b0d6226d02b1641222 (diff) | |
| download | gitea-35b02997f8599c8e260b70bc5b3239b0109c05cf.tar.gz gitea-35b02997f8599c8e260b70bc5b3239b0109c05cf.zip | |
Fix Gravatar images in web view (like commit listing)
Related to #700
In the original bug report it was referencing only the sytem avatar images for setup users (like in the header); however the problem also persists with things like commit history.
This commit fixes the `tool.AvatarLink` function so that it also uses the already existing `avatar.HashEmail` function.
I also refactored the `tool.AvatarLink` method some to make the control flow more apparent and adhere better to DRY (there were multiple calls to the `EncodeMd5` function that the `HashEmail` function call replaced, now there is only one.)
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/base/tool.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/base/tool.go b/modules/base/tool.go index 0e083c8d0c..14c0e7d086 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -23,6 +23,7 @@ import ( "github.com/Unknwon/com" "github.com/Unknwon/i18n" + "github.com/gogits/gogs/modules/avatar" "github.com/gogits/gogs/modules/setting" ) @@ -177,10 +178,13 @@ func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string func AvatarLink(email string) string { if setting.DisableGravatar { return setting.AppSubUrl + "/img/avatar_default.jpg" - } else if setting.Service.EnableCacheAvatar { - return setting.AppSubUrl + "/avatar/" + EncodeMd5(email) } - return setting.GravatarSource + EncodeMd5(email) + + gravatarHash := avatar.HashEmail(email) + if setting.Service.EnableCacheAvatar { + return setting.AppSubUrl + "/avatar/" + gravatarHash + } + return setting.GravatarSource + gravatarHash } // Seconds-based time units |