From 5ddb08dcb47f938c9ac3a3e6338d9b3cc61c20a7 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Thu, 12 Jul 2018 16:28:04 -0400 Subject: Avoid using app function so bulk loading does not fail when custom emojis are disabled (#9064) --- app/import.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'app/import.go') diff --git a/app/import.go b/app/import.go index 12353d562..37bef01e7 100644 --- a/app/import.go +++ b/app/import.go @@ -1948,11 +1948,11 @@ func (a *App) ImportEmoji(data *EmojiImportData, dryRun bool) *model.AppError { } var emoji *model.Emoji - var err *model.AppError - emoji, err = a.GetEmojiByName(*data.Name) - if err != nil && err.StatusCode != http.StatusNotFound { - return err + if result := <-a.Srv.Store.Emoji().GetByName(*data.Name); result.Err != nil && result.Err.StatusCode != http.StatusNotFound { + return result.Err + } else if result.Data != nil { + emoji = result.Data.(*model.Emoji) } alreadyExists := emoji != nil @@ -1964,8 +1964,8 @@ func (a *App) ImportEmoji(data *EmojiImportData, dryRun bool) *model.AppError { emoji.PreSave() } - file, fileErr := os.Open(*data.Image) - if fileErr != nil { + file, err := os.Open(*data.Image) + if err != nil { return model.NewAppError("BulkImport", "app.import.emoji.bad_file.error", map[string]interface{}{"EmojiName": *data.Name}, "", http.StatusBadRequest) } -- cgit v1.2.3-1-g7c22