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

2017-11-07 18:24:25 +00:00 · 2017-11-07 18:24:25 +00:00 · 85ea67494c
parent 343ffa6b97 3b1726657f
commit 85ea67494c
1 changed files with 1 additions and 1 deletions
--- a/src/components/views/rooms/PinnedEventsPanel.js
+++ b/src/components/views/rooms/PinnedEventsPanel.js
@ -75,7 +75,7 @@ module.exports = React.createClass({
        const pinnedEvents = this.props.room.currentState.getStateEvents("m.room.pinned_events", "");
        if (!pinnedEvents) return; // nothing to read

-        let readStateEvents = null;
+        let readStateEvents = [];
        const readPinsEvent = this.props.room.getAccountData("im.vector.room.read_pins");
        if (readPinsEvent && readPinsEvent.getContent()) {
            readStateEvents = readPinsEvent.getContent().event_ids || [];