summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-01-30 15:02:51 +0000
committerRichard van der Hoff <richard@matrix.org>2018-01-30 15:02:51 +0000
commit773f0eed1efa114bb32f6e54e8edc038a04d3526 (patch)
treeb821f4b06dfebade45d9bdbad498eacfccf4cdbd
parentMerge pull request #2831 from matrix-org/rav/fix-userdir-search-again (diff)
downloadsynapse-773f0eed1efa114bb32f6e54e8edc038a04d3526.tar.xz
Fix sql error in quarantine_media
-rw-r--r--synapse/storage/room.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index 23688430b7..d91c853070 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -589,7 +589,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)