diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-03 09:25:15 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-03 09:25:15 +0100 |
| commit | cb298ff623c1ad375084f7687b7f6e546c4c1c1f (patch) | |
| tree | 81854fc4ae0a45bed487a58f2c40974b683adb92 /synapse/rest/client/v1/room.py | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #3645 from matrix-org/michaelkaye/mention_newsfragment (diff) | |
| download | synapse-cb298ff623c1ad375084f7687b7f6e546c4c1c1f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_repl_servlet
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 13c331550b..fa5989e74e 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -506,7 +506,7 @@ class RoomEventServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request, room_id, event_id): requester = yield self.auth.get_user_by_req(request) - event = yield self.event_handler.get_event(requester.user, event_id) + event = yield self.event_handler.get_event(requester.user, room_id, event_id) time_now = self.clock.time_msec() if event: |