diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-01-20 15:34:18 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2016-01-20 15:34:18 +0000 |
| commit | a2ae01cc0fca9815c90028c49536dec58bd1dc64 (patch) | |
| tree | e0352a71a18f9ab5cdd52aa3e49d9cfcfd99c87d /synapse/handlers/room.py | |
| parent | Merge branch 'dbkr/no_push_for_own_events' into develop (diff) | |
| parent | Allow non-guests to peek on rooms using /events (diff) | |
| download | synapse-a2ae01cc0fca9815c90028c49536dec58bd1dc64.tar.xz | |
Merge pull request #510 from matrix-org/daniel/nonguestpeeking
Allow non-guests to peek on rooms using /events
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index a1baf9d200..58e2d25f97 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -936,7 +936,7 @@ class RoomContextHandler(BaseHandler): return self._filter_events_for_client( user.to_string(), events, - is_guest=is_guest) + is_peeking=is_guest) event = yield self.store.get_event(event_id, get_prev_content=True, allow_none=True) |