summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-08-11 10:24:41 +0100
committerErik Johnston <erik@matrix.org>2016-08-11 10:24:41 +0100
commit1d40373c9d68bd948a9829283dc16903d462ae62 (patch)
tree2f11865c25cd07001dbb4bab9d4a19281d029457 /synapse
parentMerge pull request #1000 from matrix-org/erikj/contexts (diff)
downloadsynapse-1d40373c9d68bd948a9829283dc16903d462ae62.tar.xz
Include prev_content in redacted state events
Diffstat (limited to 'synapse')
-rw-r--r--synapse/events/utils.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/events/utils.py b/synapse/events/utils.py
index aab18d7f71..0e9fd902af 100644
--- a/synapse/events/utils.py
+++ b/synapse/events/utils.py
@@ -88,6 +88,8 @@ def prune_event(event):
 
     if "age_ts" in event.unsigned:
         allowed_fields["unsigned"]["age_ts"] = event.unsigned["age_ts"]
+    if "replaces_state" in event.unsigned:
+        allowed_fields["unsigned"]["replaces_state"] = event.unsigned["replaces_state"]
 
     return type(event)(
         allowed_fields,