#3348 always use relative avatar link in the template

2 files changed, 3 insertions, 3 deletions

diff --git a/models/action.go b/models/action.go
index 6e2234fda5..081f96bb2a 100644
--- a/models/action.go
+++ b/models/action.go
@@ -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()
 		}
 	}
 
diff --git a/models/user.go b/models/user.go
index 5e9b60addb..ac3d2e819b 100644
--- 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
 }