#3348 always use relative avatar link in the template

2016-08-05 12:12:54 -07:00
parent db3d393576
commit 50422f1fc2
32 changed files with 58 additions and 57 deletions
--- 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
 }