Bug fixed for org avatar caused by #1049 (#1070)

lunny · web-flow · commit 522f1949830f · 2017-02-27T08:42:22.000+08:00
* bug fixed for org avatar caused by #1049 * use isfile only
diff --git a/models/user.go b/models/user.go
@@ -324,12 +324,12 @@ func (u *User) RelAvatarLink() string {
 
 	switch {
 	case u.UseCustomAvatar:
-		if !com.IsExist(u.CustomAvatarPath()) {
+		if !com.IsFile(u.CustomAvatarPath()) {
 			return defaultImgURL
 		}
 		return setting.AppSubURL + "/avatars/" + u.Avatar
 	case setting.DisableGravatar, setting.OfflineMode:
-		if !com.IsExist(u.CustomAvatarPath()) {
+		if !com.IsFile(u.CustomAvatarPath()) {
 			if err := u.GenerateRandomAvatar(); err != nil {
 				log.Error(3, "GenerateRandomAvatar: %v", err)
 			}

Original file line number	Diff line number	Diff line change
`@@ -324,12 +324,12 @@ func (u *User) RelAvatarLink() string {`
`324`	`324`
`325`	`325`	`switch {`
`326`	`326`	`case u.UseCustomAvatar:`
`327`		`- if !com.IsExist(u.CustomAvatarPath()) {`
	`327`	`+ if !com.IsFile(u.CustomAvatarPath()) {`
`328`	`328`	`return defaultImgURL`
`329`	`329`	`}`
`330`	`330`	`return setting.AppSubURL + "/avatars/" + u.Avatar`
`331`	`331`	`case setting.DisableGravatar, setting.OfflineMode:`
`332`		`- if !com.IsExist(u.CustomAvatarPath()) {`
	`332`	`+ if !com.IsFile(u.CustomAvatarPath()) {`
`333`	`333`	`if err := u.GenerateRandomAvatar(); err != nil {`
`334`	`334`	`log.Error(3, "GenerateRandomAvatar: %v", err)`
`335`	`335`	`}`