Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-12-20 15:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix create user can use user email which is used (#4016)

Browse Source
This commit is contained in:
Unknwon
2017-01-29 18:29:53 -05:00
parent 7b3b46c675
commit 207960b459
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gogs.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.9.125.0128" const APP_VER = "0.9.126.0129"
func init() { func init() {
setting.AppVer = APP_VER setting.AppVer = APP_VER

10
models/user_mail.go
View File

@@ -58,7 +58,15 @@ func isEmailUsed(e Engine, email string) (bool, error) {
return true, nil return true, nil
} }
return e.Get(&EmailAddress{Email: email}) has, err := e.Get(&EmailAddress{Email: email})
if err != nil {
return false, err
} else if has {
return true, nil
}
// We need to check primary email of users as well.
return e.Where("type=?", USER_TYPE_INDIVIDUAL).And("email=?", email).Get(new(User))
} }
// IsEmailUsed returns true if the email has been used. // IsEmailUsed returns true if the email has been used.

2
templates/.VERSION
View File

@@ -1 +1 @@
0.9.125.0128 0.9.126.0129