summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2018-02-01 11:45:58 +0100
committerGitHub <noreply@github.com>2018-02-01 11:45:58 +0100
commit77c0629ebca48ab19dfdfe17e116dd2c44a3c8ad (patch)
treef4efae6b88a95c3ff389419686043642e72f88f2
parentMerge pull request #2838 from matrix-org/rav/fix_logging_on_dns_fail (diff)
parentFix sql error in quarantine_media (diff)
downloadsynapse-77c0629ebca48ab19dfdfe17e116dd2c44a3c8ad.tar.xz
Merge pull request #2837 from matrix-org/rav/fix_quarantine_media
Fix sql error in quarantine_media
Diffstat (limited to '')
-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)