diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-10-18 10:59:01 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-10-18 10:59:01 +0100 |
| commit | 9fc14b5e846363275b814e38c8aed6b9d872f495 (patch) | |
| tree | c391f231619c7de2f650a8370b8dd5c2447e9230 /synapse/storage/events.py | |
| parent | Update docker-compose.yml for a static config file, and update traefik exampl... (diff) | |
| parent | Fix changelog (diff) | |
| download | synapse-9fc14b5e846363275b814e38c8aed6b9d872f495.tar.xz | |
Merge tag 'v1.4.1'
Synapse 1.4.1 (2019-10-18) ========================== No changes since 1.4.1rc1. Synapse 1.4.1rc1 (2019-10-17) ============================= Bugfixes -------- - Fix bug where redacted events were sometimes incorrectly censored in the database, breaking APIs that attempted to fetch such events. ([\#6185](https://github.com/matrix-org/synapse/issues/6185), [5b0e9948](https://github.com/matrix-org/synapse/commit/5b0e9948eaae801643e594b5abc8ee4b10bd194e))
Diffstat (limited to 'synapse/storage/events.py')
| -rw-r--r-- | synapse/storage/events.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 2e485c8644..bb6ff0595a 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -23,7 +23,7 @@ from functools import wraps from six import iteritems, text_type from six.moves import range -from canonicaljson import encode_canonical_json, json +from canonicaljson import json from prometheus_client import Counter, Histogram from twisted.internet import defer @@ -1632,9 +1632,7 @@ class EventsStore( and original_event.internal_metadata.is_redacted() ): # Redaction was allowed - pruned_json = encode_canonical_json( - prune_event_dict(original_event.get_dict()) - ) + pruned_json = encode_json(prune_event_dict(original_event.get_dict())) else: # Redaction wasn't allowed pruned_json = None |