forked from gitea/gitea
fix 500 error for ghost avatar (#9537)
This commit is contained in:
parent
c0bb5ebc15
commit
b4b8c9679f
|
@ -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))
|
||||||
|
|
Loading…
Reference in New Issue