summary refs log tree commit diff
path: root/synapse/events/utils.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-08-11 10:41:18 +0100
committerGitHub <noreply@github.com>2016-08-11 10:41:18 +0100
commitc9c1541fd08384438ada3429f81445ff0582b638 (patch)
tree2f11865c25cd07001dbb4bab9d4a19281d029457 /synapse/events/utils.py
parentMerge pull request #1000 from matrix-org/erikj/contexts (diff)
parentInclude prev_content in redacted state events (diff)
downloadsynapse-c9c1541fd08384438ada3429f81445ff0582b638.tar.xz
Merge pull request #1003 from matrix-org/erikj/redaction_prev_content
Include prev_content in redacted state events
Diffstat (limited to 'synapse/events/utils.py')
-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,