Fix AvatarLink when using a suburl and gravatar is disabled or avatars are cached

diff --git a/models/user.go b/models/user.go
index 8aa349c8a828b218bd206a370973e6c3cf21c43d..3e2ea82f43d63774c8fdffe333d203a1eb21e548 100644 (file)
--- a/models/user.go
+++ b/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
 }

diff --git a/modules/base/tool.go b/modules/base/tool.go
index eb0ac9e5bf8e542be0a9f84054d7cfb6a4252935..b4083d090fc32ee838f3ff6d6e73937910970ba0 100644 (file)
--- a/modules/base/tool.go
+++ b/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)
 }