diff options
| author | Chris <ccbrown112@gmail.com> | 2018-02-12 12:02:54 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-12 12:02:54 -0600 |
| commit | 1ae680aefae2deb1e9d07d7c2a1c863ec807a79f (patch) | |
| tree | a99a74d6b858d73624c06f85e393acbe97c90586 /api4/file.go | |
| parent | 9707ac3aaf2cb4352c573aadf54b8535e237dd9e (diff) | |
| parent | 07fd7aeeb8eb2b198b01b713a4ab57f6352faef2 (diff) | |
| download | chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.tar.gz chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.tar.bz2 chat-1ae680aefae2deb1e9d07d7c2a1c863ec807a79f.zip | |
Merge branch 'master' into release-4.7
Diffstat (limited to 'api4/file.go')
| -rw-r--r-- | api4/file.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api4/file.go b/api4/file.go index 48ee281fe..acc4c78e5 100644 --- a/api4/file.go +++ b/api4/file.go @@ -281,13 +281,13 @@ func getPublicFile(c *Context, w http.ResponseWriter, r *http.Request) { if len(hash) == 0 { c.Err = model.NewAppError("getPublicFile", "api.file.get_file.public_invalid.app_error", nil, "", http.StatusBadRequest) - http.Redirect(w, r, c.GetSiteURLHeader()+"/error?message="+utils.T(c.Err.Message), http.StatusTemporaryRedirect) + utils.RenderWebAppError(w, r, c.Err, c.App.AsymmetricSigningKey()) return } if hash != app.GeneratePublicLinkHash(info.Id, *c.App.Config().FileSettings.PublicLinkSalt) { c.Err = model.NewAppError("getPublicFile", "api.file.get_file.public_invalid.app_error", nil, "", http.StatusBadRequest) - http.Redirect(w, r, c.GetSiteURLHeader()+"/error?message="+utils.T(c.Err.Message), http.StatusTemporaryRedirect) + utils.RenderWebAppError(w, r, c.Err, c.App.AsymmetricSigningKey()) return } |