From dc53270da91c369cb00f992a600a1e014d555278 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 22 Nov 2014 10:22:53 -0500 Subject: Fix 653 --- routers/user/setting.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'routers/user/setting.go') diff --git a/routers/user/setting.go b/routers/user/setting.go index 7aeb3497..304ddd36 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -89,9 +89,6 @@ func SettingsAvatar(ctx *middleware.Context, form auth.UploadAvatarForm) { defer ctx.Redirect(setting.AppSubUrl + "/user/settings") ctx.User.UseCustomAvatar = form.Enable - if err := models.UpdateUser(ctx.User); err != nil { - ctx.Flash.Error(err.Error()) - } if form.Avatar != nil { fr, err := form.Avatar.Open() @@ -113,7 +110,19 @@ func SettingsAvatar(ctx *middleware.Context, form auth.UploadAvatarForm) { ctx.Flash.Error(err.Error()) return } + } else { + // In case no avatar at all. + if form.Enable && !com.IsFile(ctx.User.CustomAvatarPath()) { + ctx.Flash.Error(ctx.Tr("settings.no_custom_avatar_available")) + return + } } + + if err := models.UpdateUser(ctx.User); err != nil { + ctx.Flash.Error(err.Error()) + return + } + ctx.Flash.Success(ctx.Tr("settings.update_avatar_success")) } -- cgit v1.2.3