Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ignore empty avatars in v115.go (#9520)

Browse source 
* Ignore empty avatars

* fixup! Ignore empty avatars
This commit is contained in:
zeripath 2019-12-27 22:57:38 +00:00 committed by Lauris BH
parent 4acca9d2e8
commit e64880ef07
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
models/migrations/v115.go
View file

@ -47,7 +47,10 @@ func renameExistingUserAvatarName(x *xorm.Engine) error {
for _, user := range users { for _, user := range users {
oldAvatar := user.Avatar oldAvatar := user.Avatar
if _, err := os.Stat(filepath.Join(setting.AvatarUploadPath, oldAvatar)); err != nil { if stat, err := os.Stat(filepath.Join(setting.AvatarUploadPath, oldAvatar)); err != nil || !stat.Mode().IsRegular() {
if err == nil {
err = fmt.Errorf("Error: \"%s\" is not a regular file", oldAvatar)
}
log.Warn("[user: %s] os.Stat: %v", user.LowerName, err) log.Warn("[user: %s] os.Stat: %v", user.LowerName, err)
// avatar doesn't exist in the storage // avatar doesn't exist in the storage
// no need to move avatar and update database // no need to move avatar and update database