setting: check mailService.From only if it has value (#4134)

This commit is contained in:
Unknwon
2017-02-17 12:28:23 -05:00
parent 57cb23ac81
commit ba93504804
2 changed files with 34 additions and 32 deletions

View File

@@ -182,11 +182,11 @@ func HashEmail(email string) string {
// to return full URL if user enables Gravatar-like service.
func AvatarLink(email string) (url string) {
if setting.EnableFederatedAvatar && setting.LibravatarService != nil &&
len(email) > 0 {
strings.Contains(email, "@") {
var err error
url, err = setting.LibravatarService.FromEmail(email)
if err != nil {
log.Error(3, "LibravatarService.FromEmail [%s]: %v", email, err)
log.Error(2, "LibravatarService.FromEmail [%s]: %v", email, err)
}
}
if len(url) == 0 && !setting.DisableGravatar {