From 56528448fa9c7d0588ed8fd19dbdaaccb8c09d4a Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 26 Feb 2017 21:23:33 +0800 Subject: [PATCH 1/2] bug fixed for org avatar caused by #1049 --- models/user.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/user.go b/models/user.go index e03506c312953..726546c238532 100644 --- a/models/user.go +++ b/models/user.go @@ -324,12 +324,12 @@ func (u *User) RelAvatarLink() string { switch { case u.UseCustomAvatar: - if !com.IsExist(u.CustomAvatarPath()) { + if !com.IsExist(u.CustomAvatarPath()) || !com.IsFile(u.CustomAvatarPath()) { return defaultImgURL } return setting.AppSubURL + "/avatars/" + u.Avatar case setting.DisableGravatar, setting.OfflineMode: - if !com.IsExist(u.CustomAvatarPath()) { + if !com.IsExist(u.CustomAvatarPath()) || !com.IsFile(u.CustomAvatarPath()) { if err := u.GenerateRandomAvatar(); err != nil { log.Error(3, "GenerateRandomAvatar: %v", err) } From 3eee06cf74f0a7a440ef230b4059bc3edb68be26 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 26 Feb 2017 23:46:18 +0800 Subject: [PATCH 2/2] use isfile only --- models/user.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/user.go b/models/user.go index 726546c238532..67130d0131238 100644 --- a/models/user.go +++ b/models/user.go @@ -324,12 +324,12 @@ func (u *User) RelAvatarLink() string { switch { case u.UseCustomAvatar: - if !com.IsExist(u.CustomAvatarPath()) || !com.IsFile(u.CustomAvatarPath()) { + if !com.IsFile(u.CustomAvatarPath()) { return defaultImgURL } return setting.AppSubURL + "/avatars/" + u.Avatar case setting.DisableGravatar, setting.OfflineMode: - if !com.IsExist(u.CustomAvatarPath()) || !com.IsFile(u.CustomAvatarPath()) { + if !com.IsFile(u.CustomAvatarPath()) { if err := u.GenerateRandomAvatar(); err != nil { log.Error(3, "GenerateRandomAvatar: %v", err) }