summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorhmhealey <harrisonmhealey@gmail.com>2015-10-29 11:07:45 -0400
committerhmhealey <harrisonmhealey@gmail.com>2015-10-29 11:07:45 -0400
commitce4f5cb3cf5c61f346af9b94f94d9b7d2fcdd78b (patch)
treee126eaa4dd44490b3bbf2f1d5dc4c4f5954c60ff /api
parent9497ecb95423504c11e0d1cc2d70ef338fda41a5 (diff)
downloadchat-ce4f5cb3cf5c61f346af9b94f94d9b7d2fcdd78b.tar.gz
chat-ce4f5cb3cf5c61f346af9b94f94d9b7d2fcdd78b.tar.bz2
chat-ce4f5cb3cf5c61f346af9b94f94d9b7d2fcdd78b.zip
Fixed nil pointer when failing to upload an oversized image
Diffstat (limited to 'api')
-rw-r--r--api/file.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/file.go b/api/file.go
index f65be145d..8afc70692 100644
--- a/api/file.go
+++ b/api/file.go
@@ -137,7 +137,7 @@ func uploadFile(c *Context, w http.ResponseWriter, r *http.Request) {
c.Err = model.NewAppError("uploadFile", "Unable to upload image file.", err.Error())
return
} else if config.Width*config.Height > MaxImageSize {
- c.Err = model.NewAppError("uploadFile", "Unable to upload image file. File is too large.", err.Error())
+ c.Err = model.NewAppError("uploadFile", "Unable to upload image file. File is too large.", "File exceeds max image size.")
return
}
}