diff options
author | Chris <ccbrown112@gmail.com> | 2017-10-18 15:36:43 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-18 15:36:43 -0700 |
commit | 8e19ba029f889519d93cf272960dce858971106c (patch) | |
tree | d8f38ac62661fb8578e2b5c3c619fe31ab29f480 /app/emoji.go | |
parent | 34a87fa8f47b1447b73e3ae56866b654801b3eee (diff) | |
download | chat-8e19ba029f889519d93cf272960dce858971106c.tar.gz chat-8e19ba029f889519d93cf272960dce858971106c.tar.bz2 chat-8e19ba029f889519d93cf272960dce858971106c.zip |
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
Diffstat (limited to 'app/emoji.go')
-rw-r--r-- | app/emoji.go | 4 |
1 files changed, 2 insertions, 2 deletions
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) } |