summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-07-28 23:23:33 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-07-28 23:23:33 +0500
commite0b8f9eeafb7adf50f238c27c0a1dd9bb231ecb9 (patch)
tree92415fbb46ddc0d2c083a45ec1d342cf13ce27b0 /web/react/components
parent2bfe9eea5634fbfd1af328e28c4d1ef8d0411d5c (diff)
parentb15bda8328bf052d7b61075dda8c16dbad59cde8 (diff)
downloadchat-e0b8f9eeafb7adf50f238c27c0a1dd9bb231ecb9.tar.gz
chat-e0b8f9eeafb7adf50f238c27c0a1dd9bb231ecb9.tar.bz2
chat-e0b8f9eeafb7adf50f238c27c0a1dd9bb231ecb9.zip
Merge branch 'master' of https://github.com/mattermost/platform into mm-1762
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/post_body.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index 7871f52b7..9f598ecb3 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -126,7 +126,7 @@ module.exports = React.createClass({
} else if (i < Constants.MAX_DISPLAY_FILES) {
postFiles.push(
<div className="post-image__column custom-file" key={fileInfo.name+i}>
- <a href={fileInfo.path+"."+fileInfo.ext} download={fileInfo.name+"."+fileInfo.ext}>
+ <a href={fileInfo.path + (fileInfo.ext ? "." + fileInfo.ext : "")} download={fileInfo.name + (fileInfo.ext ? "." + fileInfo.ext : "")}>
<div className={"file-icon "+utils.getIconClassName(type)}/>
</a>
</div>