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

2017-02-25 21:39:52 +08:00 · 2017-02-25 21:39:52 +08:00 · 8894f856de
parent d4a7040c7f
commit 8894f856de
1 changed files with 5 additions and 0 deletions
--- 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
 	}