From 05e37264154bbcb375b358798c7a8f9b499c4881 Mon Sep 17 00:00:00 2001 From: Ethan Koenig Date: Thu, 29 Jun 2017 12:10:33 -0400 Subject: Use default avatar on error --- models/user.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'models/user.go') diff --git a/models/user.go b/models/user.go index 6484c8cf69..2a4fb557db 100644 --- a/models/user.go +++ b/models/user.go @@ -333,15 +333,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: -- cgit v1.2.3