diff options
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | models/user_mail.go | 10 | ||||
| -rw-r--r-- | templates/.VERSION | 2 |
3 files changed, 11 insertions, 3 deletions
@@ -16,7 +16,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.9.125.0128" +const APP_VER = "0.9.126.0129" func init() { setting.AppVer = APP_VER diff --git a/models/user_mail.go b/models/user_mail.go index b9b210f4..4c6efd42 100644 --- a/models/user_mail.go +++ b/models/user_mail.go @@ -58,7 +58,15 @@ func isEmailUsed(e Engine, email string) (bool, error) { 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. diff --git a/templates/.VERSION b/templates/.VERSION index e3ea0be9..a6d787ee 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.9.125.0128
\ No newline at end of file +0.9.126.0129
\ No newline at end of file |