finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

#3348 always use relative avatar link in the template

Browse source
This commit is contained in:
Unknwon 2016-08-05 12:12:54 -07:00
parent db3d393576
commit 50422f1fc2
32 changed files with 58 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/action.go
View file

@ -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()
}
}

4
models/user.go
View file

@ -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
}