diff options
| author | cpanato <ctadeu@gmail.com> | 2018-07-10 19:27:14 +0200 |
|---|---|---|
| committer | cpanato <ctadeu@gmail.com> | 2018-07-10 19:27:14 +0200 |
| commit | c042ffa460296587579aff54b157a5109e022f7e (patch) | |
| tree | 9e7f77fbc83b6d06204db099066be8999dbb22d9 /api4/emoji.go | |
| parent | 9470564d355c201155f6fcb123152b8ac954f812 (diff) | |
| parent | dccd95bc67779a5b83a2660aec0cf4622cd56550 (diff) | |
| download | chat-c042ffa460296587579aff54b157a5109e022f7e.tar.gz chat-c042ffa460296587579aff54b157a5109e022f7e.tar.bz2 chat-c042ffa460296587579aff54b157a5109e022f7e.zip | |
Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-merge-20180710
Diffstat (limited to 'api4/emoji.go')
| -rw-r--r-- | api4/emoji.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/api4/emoji.go b/api4/emoji.go index 42f66a22a..750f4b6e9 100644 --- a/api4/emoji.go +++ b/api4/emoji.go @@ -4,6 +4,8 @@ package api4 import ( + "io" + "io/ioutil" "net/http" "strings" @@ -28,6 +30,8 @@ func (api *API) InitEmoji() { } func createEmoji(c *Context, w http.ResponseWriter, r *http.Request) { + defer io.Copy(ioutil.Discard, r.Body) + if !*c.App.Config().ServiceSettings.EnableCustomEmoji { c.Err = model.NewAppError("createEmoji", "api.emoji.disabled.app_error", nil, "", http.StatusNotImplemented) return |