diff options
Diffstat (limited to 'models/user.go')
| -rw-r--r-- | models/user.go | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/models/user.go b/models/user.go index c548d6d2e3..c7e42dce0b 100644 --- a/models/user.go +++ b/models/user.go @@ -122,9 +122,8 @@ func (u *User) HomeLink() string { return setting.AppSubUrl + "/" + u.Name } -// AvatarLink returns user gravatar link. -func (u *User) AvatarLink() string { - defaultImgUrl := setting.AppSubUrl + "/img/avatar_default.jpg" +func (u *User) RelAvatarLink() string { + defaultImgUrl := "/img/avatar_default.jpg" if u.Id == -1 { return defaultImgUrl } @@ -135,7 +134,7 @@ func (u *User) AvatarLink() string { if !com.IsExist(imgPath) { return defaultImgUrl } - return setting.AppSubUrl + "/avatars/" + com.ToStr(u.Id) + return "/avatars/" + com.ToStr(u.Id) case setting.DisableGravatar, setting.OfflineMode: if !com.IsExist(imgPath) { img, err := avatar.RandomImage([]byte(u.Email)) @@ -161,13 +160,22 @@ func (u *User) AvatarLink() string { log.Info("New random avatar created: %d", u.Id) } - return setting.AppSubUrl + "/avatars/" + com.ToStr(u.Id) + return "/avatars/" + com.ToStr(u.Id) case setting.Service.EnableCacheAvatar: - return setting.AppSubUrl + "/avatar/" + u.Avatar + return "/avatar/" + u.Avatar } return setting.GravatarSource + u.Avatar } +// AvatarLink returns user gravatar link. +func (u *User) AvatarLink() string { + link := u.RelAvatarLink() + if link[0] == '/' { + return setting.AppSubUrl + link + } + return link +} + // NewGitSig generates and returns the signature of given user. func (u *User) NewGitSig() *git.Signature { return &git.Signature{ |