diff options
| author | Erik Johnston <erik@matrix.org> | 2017-06-26 14:02:44 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-06-26 14:02:44 +0100 |
| commit | e3cbec10c10e64c8388c4030191c141a8cbe4966 (patch) | |
| tree | 6a4eacab98c581406eacf47c392b7a41fa00118f /synapse/push/httppusher.py | |
| parent | Reject local events that don't round trip the DB (diff) | |
| parent | Merge pull request #2301 from xwiki-labs/push-redact-content (diff) | |
| download | synapse-e3cbec10c10e64c8388c4030191c141a8cbe4966.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/ensure_round_trip
Diffstat (limited to '')
| -rw-r--r-- | synapse/push/httppusher.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py index c0f8176e3d..8a5d473108 100644 --- a/synapse/push/httppusher.py +++ b/synapse/push/httppusher.py @@ -275,7 +275,7 @@ class HttpPusher(object): if event.type == 'm.room.member': d['notification']['membership'] = event.content['membership'] d['notification']['user_is_target'] = event.state_key == self.user_id - if 'content' in event: + if not self.hs.config.push_redact_content and 'content' in event: d['notification']['content'] = event.content # We no longer send aliases separately, instead, we send the human |