From a54cd82d7ffac0db78ccc45bdb3ad427346da2f2 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Mon, 6 Mar 2017 21:04:46 -0300 Subject: [PATCH] Fix ramdom avatar begin regenerated on every page refresh See this line: https://github.com/go-gitea/gitea/blob/848293671b5d9c31ce3eb9ad8a1f130edd0ee7c5/models/user.go#L335 This line was always returning true because u.CustomAvatarPath() uses a email hash to generate the avatar path, but it was actually generated and served by the user ID. Using hash on all cases is more consistent and fixes the issue. --- models/user.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/models/user.go b/models/user.go index fc78c5800f47d..fce7bfd8505f3 100644 --- a/models/user.go +++ b/models/user.go @@ -296,9 +296,6 @@ func (u *User) GenerateRandomAvatar() 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 - u.Avatar = fmt.Sprintf("%d", u.ID) if err = os.MkdirAll(filepath.Dir(u.CustomAvatarPath()), os.ModePerm); err != nil { return fmt.Errorf("MkdirAll: %v", err) }