diff options
| author | Erik Johnston <erik@matrix.org> | 2020-01-22 16:53:28 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-01-22 16:53:28 +0000 |
| commit | 57a60365da0c47f286ea4608d766abbca5762233 (patch) | |
| tree | aaef0948f26f3352092b787d32e1dda0743d697e /synapse/config/push.py | |
| parent | Pull out more info about room key requests (diff) | |
| parent | Remove unnecessary abstractions in admin handler (#6751) (diff) | |
| download | synapse-github/erikj/debug_direct_message_checks.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/debug_direct_message_checks github/erikj/debug_direct_message_checks erikj/debug_direct_message_checks
Diffstat (limited to 'synapse/config/push.py')
| -rw-r--r-- | synapse/config/push.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/push.py b/synapse/config/push.py index 0910958649..6f2b3a7faa 100644 --- a/synapse/config/push.py +++ b/synapse/config/push.py @@ -35,7 +35,7 @@ class PushConfig(Config): # Now check for the one in the 'email' section and honour it, # with a warning. - push_config = config.get("email", {}) + push_config = config.get("email") or {} redact_content = push_config.get("redact_content") if redact_content is not None: print( |