diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-10-29 12:43:42 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-10-29 12:43:42 -0400 |
| commit | 444c9942fc30790fa981da65769ba5cd01ae9712 (patch) | |
| tree | 1272c792685be0e9d19443e2b4aafe78c57dafd7 | |
| parent | 6683a4aaab1ffbdc91eeeb3cdaab6dbfd9a1f946 (diff) | |
| parent | ce4f5cb3cf5c61f346af9b94f94d9b7d2fcdd78b (diff) | |
| download | chat-444c9942fc30790fa981da65769ba5cd01ae9712.tar.gz chat-444c9942fc30790fa981da65769ba5cd01ae9712.tar.bz2 chat-444c9942fc30790fa981da65769ba5cd01ae9712.zip | |
Merge pull request #1231 from hmhealey/plt798
PLT-798 Fixed nil pointer when failing to upload an oversized image
| -rw-r--r-- | api/file.go | 2 |
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 } } |