diff options
| author | JoramWilander <jwawilander@gmail.com> | 2015-06-15 11:51:10 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2015-06-15 11:51:10 -0400 |
| commit | 706bba193d65b4d25974a36e434eda50b852290a (patch) | |
| tree | e7ca19a0dec2fabfed33e04b4cee57a0a2cc7bb1 | |
| parent | c94883e0dfc0c7cbcf86a78f9134d1e3283a07cd (diff) | |
| download | chat-706bba193d65b4d25974a36e434eda50b852290a.tar.gz chat-706bba193d65b4d25974a36e434eda50b852290a.tar.bz2 chat-706bba193d65b4d25974a36e434eda50b852290a.zip | |
fixes mm-1245 filenames are now url escaped
| -rw-r--r-- | api/file.go | 2 | ||||
| -rw-r--r-- | web/react/components/view_image.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/file.go b/api/file.go index c7c3b7b3e..10167c6ff 100644 --- a/api/file.go +++ b/api/file.go @@ -114,7 +114,7 @@ func uploadFile(c *Context, w http.ResponseWriter, r *http.Request) { return } - fileUrl := c.TeamUrl + "/api/v1/files/get/" + channelId + "/" + c.Session.UserId + "/" + uid + "/" + files[i].Filename + fileUrl := c.TeamUrl + "/api/v1/files/get/" + channelId + "/" + c.Session.UserId + "/" + uid + "/" + url.QueryEscape(files[i].Filename) resStruct.Filenames = append(resStruct.Filenames, fileUrl) } diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index 7d0f0d8a9..4cb30e1d3 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -165,7 +165,7 @@ module.exports = React.createClass({ <span className="text"> | </span> </div> : "" } - <a href={this.props.filenames[id]} download={name} className="text">Download</a> + <a href={this.props.filenames[id]} download={decodeURIComponent(name)} className="text">Download</a> </div> </div> {loading} |