From 8e19ba029f889519d93cf272960dce858971106c Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 18 Oct 2017 15:36:43 -0700 Subject: Reduce utils.Cfg references (#7650) * app.UpdateConfig method * test fix * another test fix * the config override option as-was is just error prone, remove it for now * derp --- app/emoji.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/emoji.go') diff --git a/app/emoji.go b/app/emoji.go index 308791aed..ba2bb4494 100644 --- a/app/emoji.go +++ b/app/emoji.go @@ -137,11 +137,11 @@ func (a *App) DeleteEmoji(emoji *model.Emoji) *model.AppError { } func (a *App) GetEmoji(emojiId string) (*model.Emoji, *model.AppError) { - if !*utils.Cfg.ServiceSettings.EnableCustomEmoji { + if !*a.Config().ServiceSettings.EnableCustomEmoji { return nil, model.NewAppError("deleteEmoji", "api.emoji.disabled.app_error", nil, "", http.StatusNotImplemented) } - if len(*utils.Cfg.FileSettings.DriverName) == 0 { + if len(*a.Config().FileSettings.DriverName) == 0 { return nil, model.NewAppError("deleteImage", "api.emoji.storage.app_error", nil, "", http.StatusNotImplemented) } -- cgit v1.2.3-1-g7c22