summaryrefslogtreecommitdiffstats
path: root/models/user.go
diff options
context:
space:
mode:
authorPaweł Bogusławski <pawel.boguslawski@ib.pl>2020-10-26 14:56:14 +0100
committerGitHub <noreply@github.com>2020-10-26 15:56:14 +0200
commit28133a801a41a04470ddea9170acbba7dd2126e5 (patch)
tree33d1af3ea7cb9a393c32cfba5483976cb7761aa4 /models/user.go
parent3d272b899d77a6bff864784d8f947bc1ca90fe60 (diff)
downloadgitea-28133a801a41a04470ddea9170acbba7dd2126e5.tar.gz
gitea-28133a801a41a04470ddea9170acbba7dd2126e5.zip
Avatar autogeneration fixed (#13282)
This mod fixes problem with initial avatar autogeneration and avatar autogneration after deleting previous avatar. Related: https://github.com/go-gitea/gitea/issues/13159 Fixes: 80a6b0f5bce15a641fc75f5f1ef6e42ef54424bc Author-Change-Id: IB#1105243
Diffstat (limited to 'models/user.go')
-rw-r--r--models/user.go4
1 files changed, 0 insertions, 4 deletions
diff --git a/models/user.go b/models/user.go
index 7248db5337..1ab417115f 100644
--- a/models/user.go
+++ b/models/user.go
@@ -191,9 +191,6 @@ func (u *User) BeforeUpdate() {
if len(u.AvatarEmail) == 0 {
u.AvatarEmail = u.Email
}
- if len(u.AvatarEmail) > 0 && u.Avatar == "" {
- u.Avatar = base.HashEmail(u.AvatarEmail)
- }
}
u.LowerName = strings.ToLower(u.Name)
@@ -835,7 +832,6 @@ func CreateUser(u *User) (err error) {
u.LowerName = strings.ToLower(u.Name)
u.AvatarEmail = u.Email
- u.Avatar = base.HashEmail(u.AvatarEmail)
if u.Rands, err = GetUserSalt(); err != nil {
return err
}