Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

fix 500 error for ghost avatar (#9537)

Browse source
This commit is contained in:
6543 2019-12-30 11:55:51 +01:00 committed by Lunny Xiao
parent c0bb5ebc15
commit b4b8c9679f
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
routers/user/avatar.go
View file

@ -6,6 +6,7 @@ package user
import ( import (
"strconv" "strconv"
"strings"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
@ -23,14 +24,19 @@ func Avatar(ctx *context.Context) {
log.Debug("Asked avatar for user %v and size %v", userName, size) log.Debug("Asked avatar for user %v and size %v", userName, size)
user, err := models.GetUserByName(userName) var user *models.User
if err != nil { if strings.ToLower(userName) != "ghost" {
if models.IsErrUserNotExist(err) { user, err = models.GetUserByName(userName)
ctx.ServerError("Requested avatar for invalid user", err) if err != nil {
} else { if models.IsErrUserNotExist(err) {
ctx.ServerError("Retrieving user by name", err) ctx.ServerError("Requested avatar for invalid user", err)
} else {
ctx.ServerError("Retrieving user by name", err)
}
return
} }
return } else {
user = models.NewGhostUser()
} }
ctx.Redirect(user.RealSizedAvatarLink(size)) ctx.Redirect(user.RealSizedAvatarLink(size))