fix 500 when change user setting email to an exist email (#1039)

diff --git a/routers/user/setting.go b/routers/user/setting.go
index de5a1baca4219cce7e5330bb94eb499f8bffa86a..16ba2bb050fa7be0c0f3158cff26ddd5e18b2a5d 100644 (file)
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -105,6 +105,11 @@ func SettingsPost(ctx *context.Context, form auth.UpdateProfileForm) {
        ctx.User.Website = form.Website
        ctx.User.Location = form.Location
        if err := models.UpdateUser(ctx.User); err != nil {
+               if _, ok := err.(models.ErrEmailAlreadyUsed); ok {
+                       ctx.Flash.Error(ctx.Tr("form.email_been_used"))
+                       ctx.Redirect(setting.AppSubURL + "/user/settings")
+                       return
+               }
                ctx.Handle(500, "UpdateUser", err)
                return
        }