diff options
| author | Erik Johnston <erik@matrix.org> | 2018-04-25 15:11:18 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-04-25 15:11:18 +0100 |
| commit | ba3166743c50cb85c9ab2d35eb31968f892260bc (patch) | |
| tree | 93a42d285e9fd55b91127ae34cf9ab7ce4ac6b0f /synapse | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-ba3166743c50cb85c9ab2d35eb31968f892260bc.tar.xz | |
Fix quarantine media admin API
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index 740c036975..c0c01bcfbe 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -595,7 +595,7 @@ class RoomStore(RoomWorkerStore, SearchStore): while next_token: sql = """ SELECT stream_ordering, json FROM events - JOIN event_json USING (event_id) + JOIN event_json USING (room_id, event_id) WHERE room_id = ? AND stream_ordering < ? AND contains_url = ? AND outlier = ? |