linden123/githaven-fork
1
1
Fork 0
forked from Shiloh/githaven
Code Pull Requests Activity

Return avatar link as absolute url (#3235)

Browse Source 
Fixes relative urls coming from api/v1

See https://github.com/drone/drone/issues/1701
This commit is contained in:
Sandro Santilli 2016-07-16 02:19:30 +02:00 committed by 无闻
parent 3d93532c87
commit a4ea3bd015
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
models/user.go
View File

@ -263,11 +263,11 @@ func (u *User) RelAvatarLink() string {
return setting.GravatarSource + u.Avatar return setting.GravatarSource + u.Avatar
} }
// AvatarLink returns user gravatar link. // AvatarLink returns user avatar link.
func (u *User) AvatarLink() string { func (u *User) AvatarLink() string {
link := u.RelAvatarLink() link := u.RelAvatarLink()
if link[0] == '/' && link[1] != '/' { if link[0] == '/' && link[1] != '/' {
return setting.AppSubUrl + link return strings.TrimSuffix(setting.AppUrl, "/") + link
} }
return link return link
} }