summaryrefslogtreecommitdiffstats
path: root/webapp/components/post_view
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-07-20 08:56:23 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2017-07-20 08:56:23 -0400
commit5ae701d133f713363e52b9cc6aa01579c81ebab4 (patch)
tree622aba2f53fa33812a92fbf41e250d2155776846 /webapp/components/post_view
parent9731eb476400a1eaf2fa45edfc724a35a25a9063 (diff)
downloadchat-5ae701d133f713363e52b9cc6aa01579c81ebab4.tar.gz
chat-5ae701d133f713363e52b9cc6aa01579c81ebab4.tar.bz2
chat-5ae701d133f713363e52b9cc6aa01579c81ebab4.zip
Update mattermost-redux to master (#6982)
Diffstat (limited to 'webapp/components/post_view')
-rw-r--r--webapp/components/post_view/commented_on_files_message/commented_on_files_message.jsx2
-rw-r--r--webapp/components/post_view/commented_on_files_message/index.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/post_view/commented_on_files_message/commented_on_files_message.jsx b/webapp/components/post_view/commented_on_files_message/commented_on_files_message.jsx
index a8c6845c8..1755d68e4 100644
--- a/webapp/components/post_view/commented_on_files_message/commented_on_files_message.jsx
+++ b/webapp/components/post_view/commented_on_files_message/commented_on_files_message.jsx
@@ -45,7 +45,7 @@ export default class CommentedOnFilesMessage extends React.PureComponent {
id='post_body.plusMore'
defaultMessage=' plus {count, number} other {count, plural, one {file} other {files}}'
values={{
- count: this.props.fileInfos.length
+ count: this.props.fileInfos.length - 1
}}
/>
);
diff --git a/webapp/components/post_view/commented_on_files_message/index.js b/webapp/components/post_view/commented_on_files_message/index.js
index fd6aa7193..d55cff16b 100644
--- a/webapp/components/post_view/commented_on_files_message/index.js
+++ b/webapp/components/post_view/commented_on_files_message/index.js
@@ -15,7 +15,7 @@ function makeMapStateToProps() {
return function mapStateToProps(state, ownProps) {
let fileInfos;
if (ownProps.parentPostId) {
- fileInfos = selectFileInfosForPost(state, {id: ownProps.parentPostId});
+ fileInfos = selectFileInfosForPost(state, ownProps.parentPostId);
}
return {