diff options
| author | George Goldberg <george@gberg.me> | 2017-09-15 13:32:11 +0100 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-09-15 08:32:11 -0400 |
| commit | 2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d (patch) | |
| tree | 513dee966bfa8d3810ddf631df90270acd342e4f /model/utils.go | |
| parent | 600beb5af3e35fd82a2b06995b67629d08fe0fe3 (diff) | |
| download | chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.tar.gz chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.tar.bz2 chat-2be5577b88e5ff85a98b0a2b3e3a43b90cc99c6d.zip | |
Model: NewLocAppError -> NewAppError (#7450)
Diffstat (limited to 'model/utils.go')
| -rw-r--r-- | model/utils.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/model/utils.go b/model/utils.go index 8994a2422..eacfa5b2a 100644 --- a/model/utils.go +++ b/model/utils.go @@ -12,6 +12,7 @@ import ( "io" "io/ioutil" "net" + "net/http" "net/mail" "net/url" "regexp" @@ -91,7 +92,7 @@ func AppErrorFromJson(data io.Reader) *AppError { if err == nil { return &er } else { - return NewLocAppError("AppErrorFromJson", "model.utils.decode_json.app_error", nil, "body: "+str) + return NewAppError("AppErrorFromJson", "model.utils.decode_json.app_error", nil, "body: "+str, http.StatusInternalServerError) } } |