aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-04 14:46:57 -05:00
Code

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

Browse Source
This commit is contained in:
Martin van Beurden 2014-09-28 14:27:13 +02:00
parent 5e747bc877
commit bb05ef907b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
models/user.go
View File

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

4
modules/base/tool.go
View File

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