diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/pull.go | 2 | ||||
| -rw-r--r-- | models/user.go | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/models/pull.go b/models/pull.go index 78c8d156..f5198d87 100644 --- a/models/pull.go +++ b/models/pull.go @@ -246,7 +246,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error Sender: &api.PayloadUser{ UserName: doer.Name, ID: doer.ID, - AvatarUrl: setting.AppUrl + doer.RelAvatarLink(), + AvatarUrl: doer.AvatarLink(), }, } if err = PrepareWebhooks(pr.BaseRepo, HOOK_EVENT_PUSH, p); err != nil { diff --git a/models/user.go b/models/user.go index ac3d2e81..941dc054 100644 --- a/models/user.go +++ b/models/user.go @@ -230,8 +230,11 @@ func (u *User) GenerateRandomAvatar() error { return nil } +// RelAvatarLink returns relative avatar link to the site domain, +// 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 := "/img/avatar_default.png" + defaultImgUrl := setting.AppSubUrl + "/img/avatar_default.png" if u.ID == -1 { return defaultImgUrl } @@ -241,7 +244,7 @@ func (u *User) RelAvatarLink() string { if !com.IsExist(u.CustomAvatarPath()) { return defaultImgUrl } - return "/avatars/" + com.ToStr(u.ID) + return setting.AppSubUrl + "/avatars/" + com.ToStr(u.ID) case setting.DisableGravatar, setting.OfflineMode: if !com.IsExist(u.CustomAvatarPath()) { if err := u.GenerateRandomAvatar(); err != nil { @@ -249,7 +252,7 @@ func (u *User) RelAvatarLink() string { } } - return "/avatars/" + com.ToStr(u.ID) + return setting.AppSubUrl + "/avatars/" + com.ToStr(u.ID) } return setting.GravatarSource + u.Avatar } |