Fixes missing avatars in offline mode (#3471)

sdwolfz · bkcsoft · commit 011f128c892e · 2018-02-08T16:43:08.000+01:00
Signed-off-by: Codruț Constantin Gușoi &lt;codrut.gusoi@gmail.com&gt;
diff --git a/models/user.go b/models/user.go
@@ -299,7 +299,9 @@ func (u *User) generateRandomAvatar(e Engine) error {
 	}
 	// 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 u.Avatar == "" {
+		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)
 	}

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,9 @@ func (u *User) generateRandomAvatar(e Engine) error {`
`299`	`299`	`}`
`300`	`300`	`// NOTICE for random avatar, it still uses id as avatar name, but custom avatar use md5`
`301`	`301`	`// since random image is not a user's photo, there is no security for enumable`
`302`		`- u.Avatar = fmt.Sprintf("%d", u.ID)`
	`302`	`+ if u.Avatar == "" {`
	`303`	`+ u.Avatar = fmt.Sprintf("%d", u.ID)`
	`304`	`+ }`
`303`	`305`	`if err = os.MkdirAll(filepath.Dir(u.CustomAvatarPath()), os.ModePerm); err != nil {`
`304`	`306`	`return fmt.Errorf("MkdirAll: %v", err)`
`305`	`307`	`}`