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

Release: Directory should use the alias or server information to join the room

src/components/structures/RoomDirectory.js

@@ -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();
     },