Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 12:26:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into travis/admin-list-media

Browse source
This commit is contained in:
Travis Ralston 2018-02-01 18:05:47 -07:00 • committed by GitHub
commit 6e87b34f7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
47 changed files with 716 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/storage/room.py
View file

@ -577,7 +577,7 @@ class RoomStore(SQLBaseStore):
"""
UPDATE remote_media_cache
SET quarantined_by = ?
WHERE media_origin AND media_id = ?
WHERE media_origin = ? AND media_id = ?
""",
(
(quarantined_by, origin, media_id)