summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-21 11:39:38 +0100
committerErik Johnston <erik@matrix.org>2015-08-21 11:39:38 +0100
commit745b72660acd6760334b7be51ad2d91eef2e0257 (patch)
tree3001ef666fa2c2f3d658f5e60dd3b08e39337be6 /synapse/storage
parentReturn fully qualified user_id as per spec (diff)
parentFix bug where we didn't correctly serialize the redacted_because key over fed... (diff)
downloadsynapse-745b72660acd6760334b7be51ad2d91eef2e0257.tar.xz
Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/events.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 5b64918024..e3eabab13d 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -811,6 +811,8 @@ class EventsStore(SQLBaseStore):
             )
 
             if because:
+                # It's fine to do add the event directly, since get_pdu_json
+                # will serialise this field correctly
                 ev.unsigned["redacted_because"] = because
 
         if get_prev_content and "replaces_state" in ev.unsigned: