diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-08-20 23:38:08 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-08-20 23:38:08 +0500 |
commit | 1bd859c6ae25d0964debf9aeda6ea29250716985 (patch) | |
tree | 9ed2c3a8d8080d0e8c2981bb7ccdb03a37ab588f /web/react/components/file_upload.jsx | |
parent | 981efa89b9ed204ac27a3de3a67380ae58d20065 (diff) | |
parent | 2398d768d53039273a9edb657d9466f7a9d67a91 (diff) | |
download | chat-1bd859c6ae25d0964debf9aeda6ea29250716985.tar.gz chat-1bd859c6ae25d0964debf9aeda6ea29250716985.tar.bz2 chat-1bd859c6ae25d0964debf9aeda6ea29250716985.zip |
Merge branch 'master' of https://github.com/mattermost/platform into ui-changes
Diffstat (limited to 'web/react/components/file_upload.jsx')
-rw-r--r-- | web/react/components/file_upload.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx index 7497ec330..e77982559 100644 --- a/web/react/components/file_upload.jsx +++ b/web/react/components/file_upload.jsx @@ -219,7 +219,7 @@ module.exports = React.createClass({ continue; } - var channelId = this.props.channelId || ChannelStore.getCurrentId(); + var channelId = self.props.channelId || ChannelStore.getCurrentId(); // generate a unique id that can be used by other components to refer back to this file upload var clientId = utils.generateId(); |