aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--models/user.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/models/user.go b/models/user.go
index 5c6101e6..a83051db 100644
--- a/models/user.go
+++ b/models/user.go
@@ -21,6 +21,7 @@ import (
"github.com/Unknwon/com"
"github.com/nfnt/resize"
+ "github.com/gogits/gogs/modules/avatar"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/git"
"github.com/gogits/gogs/modules/log"
@@ -276,8 +277,8 @@ func CreateUser(u *User) error {
}
u.LowerName = strings.ToLower(u.Name)
- u.Avatar = base.EncodeMd5(u.Email)
u.AvatarEmail = u.Email
+ u.Avatar = avatar.HashEmail(u.AvatarEmail)
u.Rands = GetUserSalt()
u.Salt = GetUserSalt()
u.EncodePasswd()
@@ -436,6 +437,11 @@ func UpdateUser(u *User) error {
u.Description = u.Description[:255]
}
+ if u.AvatarEmail == "" {
+ u.AvatarEmail = u.Email
+ }
+ u.Avatar = avatar.HashEmail(u.AvatarEmail)
+
_, err = x.Id(u.Id).AllCols().Update(u)
return err
}