diff options
| author | Don Bowman <don.waterloo@gmail.com> | 2015-08-12 21:10:00 +0000 |
|---|---|---|
| committer | Don Bowman <don.waterloo@gmail.com> | 2015-08-12 21:10:00 +0000 |
| commit | 1cb46ede1acf4f8527e64fcae7e92672cad764b2 (patch) | |
| tree | fabb54ee5f040be2a4ee5c95f87cb3e9fbf7bdea /routers/org/setting.go | |
| parent | 9e6bd31d76aa6d6495a2144466af78773f34d07c (diff) | |
| parent | aede5cdb04fdbf74d9c602062fdece9f408e90f4 (diff) | |
Merge branch 'master' of https://github.com/gogits/gogs
Conflicts:
routers/repo/download.go
Diffstat (limited to 'routers/org/setting.go')
| -rw-r--r-- | routers/org/setting.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/org/setting.go b/routers/org/setting.go index 8bc6a2a9..7a761995 100644 --- a/routers/org/setting.go +++ b/routers/org/setting.go @@ -68,7 +68,7 @@ func SettingsPost(ctx *middleware.Context, form auth.UpdateOrgSettingForm) { org.Avatar = base.EncodeMd5(form.Avatar) org.AvatarEmail = form.Avatar if err := models.UpdateUser(org); err != nil { - if err == models.ErrEmailAlreadyUsed { + if models.IsErrEmailAlreadyUsed(err) { ctx.Data["Err_Email"] = true ctx.RenderWithErr(ctx.Tr("form.email_been_used"), SETTINGS_OPTIONS, &form) } else { |