From 50422f1fc226d71fe2f5f701c7ebdd1a5f2d143e Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 5 Aug 2016 12:12:54 -0700 Subject: #3348 always use relative avatar link in the template --- models/action.go | 2 +- models/user.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'models') diff --git a/models/action.go b/models/action.go index 6e2234fd..081f96bb 100644 --- a/models/action.go +++ b/models/action.go @@ -288,7 +288,7 @@ func (push *PushCommits) AvatarLink(email string) string { log.Error(4, "GetUserByEmail: %v", err) } } else { - push.avatars[email] = u.AvatarLink() + push.avatars[email] = u.RelAvatarLink() } } diff --git a/models/user.go b/models/user.go index 5e9b60ad..ac3d2e81 100644 --- a/models/user.go +++ b/models/user.go @@ -254,11 +254,11 @@ func (u *User) RelAvatarLink() string { return setting.GravatarSource + u.Avatar } -// AvatarLink returns user avatar link. +// AvatarLink returns user avatar absolute link. func (u *User) AvatarLink() string { link := u.RelAvatarLink() if link[0] == '/' && link[1] != '/' { - return strings.TrimSuffix(setting.AppUrl, "/") + link + return setting.AppUrl + link[1:] } return link } -- cgit v1.2.3