oss/forgejo
oss/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-06 17:40:57 +00:00
Code Wiki Activity

Don't ignore gravatar error (#2138)

Browse source
This commit is contained in:
Ethan Koenig 2017-07-11 02:00:43 -04:00 • committed by Bo-Yi Wu
parent 406f5de18c
commit 6caf04c129
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
models/user.go
View file

@ -328,15 +328,14 @@ func (u *User) generateRandomAvatar(e Engine) error {
// which includes app sub-url as prefix. However, it is possible
// to return full URL if user enables Gravatar-like service.
func (u *User) RelAvatarLink() string {
defaultImgURL := setting.AppSubURL + "/img/avatar_default.png"
if u.ID == -1 {
return defaultImgURL
return base.DefaultAvatarLink()
}
switch {
case u.UseCustomAvatar:
if !com.IsFile(u.CustomAvatarPath()) {
return defaultImgURL
return base.DefaultAvatarLink()
}
return setting.AppSubURL + "/avatars/" + u.Avatar
case setting.DisableGravatar, setting.OfflineMode: