Merge pull request #509 from chadoe/avatarlink

Fix AvatarLink when using a suburl

models/user.go

@@ -97,9 +97,9 @@ func (u *User) HomeLink() string {
 // AvatarLink returns user gravatar link.
 func (u *User) AvatarLink() string {
 	if setting.DisableGravatar {
-		return "/img/avatar_default.jpg"
+		return setting.AppSubUrl + "/img/avatar_default.jpg"
 	} else if setting.Service.EnableCacheAvatar {
-		return "/avatar/" + u.Avatar
+		return setting.AppSubUrl + "/avatar/" + u.Avatar
 	}
 	return "//1.gravatar.com/avatar/" + u.Avatar
 }

modules/base/tool.go

@@ -146,9 +146,9 @@ func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string
 // AvatarLink returns avatar link by given e-mail.
 func AvatarLink(email string) string {
 	if setting.DisableGravatar {
-		return "/img/avatar_default.jpg"
+		return setting.AppSubUrl + "/img/avatar_default.jpg"
 	} else if setting.Service.EnableCacheAvatar {
-		return "/avatar/" + EncodeMd5(email)
+		return setting.AppSubUrl + "/avatar/" + EncodeMd5(email)
 	}
 	return "//1.gravatar.com/avatar/" + EncodeMd5(email)
 }