From d2ad4dec63cb3ee94b5ba997aa2e2514abc53096 Mon Sep 17 00:00:00 2001 From: Paweł Bogusławski Date: Fri, 23 Oct 2020 19:55:10 +0200 Subject: Avatar autogeneration fixed (#13233) 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 --- models/user_avatar.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'models/user_avatar.go') diff --git a/models/user_avatar.go b/models/user_avatar.go index 0a03ca7707..2f9db5c2e2 100644 --- a/models/user_avatar.go +++ b/models/user_avatar.go @@ -39,10 +39,9 @@ func (u *User) generateRandomAvatar(e Engine) error { if err != nil { return fmt.Errorf("RandomImage: %v", err) } - // NOTICE for random avatar, it still uses id as avatar name, but custom avatar use md5 - // since random image is not a user's photo, there is no security for enumable + if u.Avatar == "" { - u.Avatar = fmt.Sprintf("%d", u.ID) + u.Avatar = base.HashEmail(u.AvatarEmail) } if err := storage.SaveFrom(storage.Avatars, u.CustomAvatarRelativePath(), func(w io.Writer) error { -- cgit v1.2.3