Merge pull request #3448 from matrix-org/bwindels/joinrdfix

Release: Directory should use the alias or server information to join the room
This commit is contained in:
David Baker 2019-09-16 17:34:44 +01:00 committed by GitHub
commit 51dd0cd88a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -390,13 +390,7 @@ module.exports = React.createClass({
},
onJoinClick: function(ev, room) {
this.props.onFinished();
MatrixClientPeg.get().joinRoom(room.room_id);
dis.dispatch({
action: 'view_room',
room_id: room.room_id,
joining: true,
});
this.showRoom(room, null, true);
ev.stopPropagation();
},