]> source.dussan.org Git - gitea.git/commitdiff
fix panic issue on update avatar email (#4580) (#4590)
authorDingjun <fangdingjun@gmail.com>
Wed, 1 Aug 2018 13:34:57 +0000 (21:34 +0800)
committerBo-Yi Wu <appleboy.tw@gmail.com>
Wed, 1 Aug 2018 13:34:57 +0000 (21:34 +0800)
fix #4580

back port PR for release/v1.5,  refer to #4581

routers/user/setting/profile.go

index 22511ab89144dd48e435e762fd63c78f0275a676..6a2eacd09de857af07f24ad8ecbd71cdb6da929d 100644 (file)
@@ -119,7 +119,7 @@ func UpdateAvatarSetting(ctx *context.Context, form auth.AvatarForm, ctxUser *mo
                ctxUser.AvatarEmail = form.Gravatar
        }
 
-       if form.Avatar.Filename != "" {
+       if form.Avatar != nil && form.Avatar.Filename != "" {
                fr, err := form.Avatar.Open()
                if err != nil {
                        return fmt.Errorf("Avatar.Open: %v", err)