Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Upstream
Gitea
Commits
b4b8c967
Commit
b4b8c967
authored
5 years ago
by
6543
Committed by
Lunny Xiao
5 years ago
Browse files
Options
Download
Email Patches
Plain Diff
fix 500 error for ghost avatar (#9537)
parent
c0bb5ebc
release/v1.10
v1.10.6
v1.10.4
v1.10.3
v1.10.2
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
routers/user/avatar.go
+13
-7
routers/user/avatar.go
with
13 additions
and
7 deletions
+13
-7
routers/user/avatar.go
View file @
b4b8c967
...
...
@@ -6,6 +6,7 @@ package user
import
(
"strconv"
"strings"
"code.gitea.io/gitea/models"
"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
)
user
,
err
:=
models
.
GetUserByName
(
userName
)
if
err
!=
nil
{
if
models
.
IsErrUserNotExist
(
err
)
{
ctx
.
ServerError
(
"Requested avatar for invalid user"
,
err
)
}
else
{
ctx
.
ServerError
(
"Retrieving user by name"
,
err
)
var
user
*
models
.
User
if
strings
.
ToLower
(
userName
)
!=
"ghost"
{
user
,
err
=
models
.
GetUserByName
(
userName
)
if
err
!=
nil
{
if
models
.
IsErrUserNotExist
(
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
))
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help