matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Weblate
2018-09-05 17:09:54 +00:00
parent c132b5b9fc 9f5ea73dc2
commit 0979baa24d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/rooms/MessageComposer.js
View File

@@ -309,8 +309,8 @@ export default class MessageComposer extends React.Component {
</div>;
}
const canSendMessages = !this.state.tombstone &&
this.props.room.maySendMessage();
const canSendMessages = !this.state.tombstone && this.props.room.currentState.maySendMessage(
MatrixClientPeg.get().credentials.userId);
if (canSendMessages) {
// This also currently includes the call buttons. Really we should