summaryrefslogtreecommitdiffstats
path: root/api4
diff options
context:
space:
mode:
authorcpanato <ctadeu@gmail.com>2018-08-08 13:53:10 +0200
committercpanato <ctadeu@gmail.com>2018-08-08 13:53:10 +0200
commitae891321ad2e4b07e4f77b252379cb998607c687 (patch)
treede7cfa9b9fb1c0d7da2164e42e8516f62c7aaff1 /api4
parent99cf15b56eb561dc30def86ad7e3cd97af4c338c (diff)
parent5fbec91c35d7ea5d9b920b26a01fc21da55bb08e (diff)
downloadchat-ae891321ad2e4b07e4f77b252379cb998607c687.tar.gz
chat-ae891321ad2e4b07e4f77b252379cb998607c687.tar.bz2
chat-ae891321ad2e4b07e4f77b252379cb998607c687.zip
Merge remote-tracking branch 'upstream/release-5.2' into release-5.2-daily-merge-20180808
Diffstat (limited to 'api4')
-rw-r--r--api4/file.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/api4/file.go b/api4/file.go
index f73a54fb4..cfb72cdcb 100644
--- a/api4/file.go
+++ b/api4/file.go
@@ -285,6 +285,7 @@ func getFilePreview(c *Context, w http.ResponseWriter, r *http.Request) {
if err != nil {
c.Err = err
c.Err.StatusCode = http.StatusNotFound
+ return
}
defer fileReader.Close()