summary refs log tree commit diff
path: root/synapse/config/push.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2020-01-17 10:04:15 +0000
committerGitHub <noreply@github.com>2020-01-17 10:04:15 +0000
commit5ce0b17e38404fceb8867fdb3b4b59c00db6b1e6 (patch)
treef131b5591e1fb849e3fbb38cfeff7a8412582e50 /synapse/config/push.py
parentAdd StateMap type alias (#6715) (diff)
downloadsynapse-5ce0b17e38404fceb8867fdb3b4b59c00db6b1e6.tar.xz
Clarify the `account_validity` and `email` sections of the sample configuration. (#6685)
Generally try to make this more comprehensible, and make it match the
conventions.

I've removed the documentation for all the settings which allow you to change
the names of the template files, because I can't really see why they are
useful.
Diffstat (limited to 'synapse/config/push.py')
-rw-r--r--synapse/config/push.py2
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(