summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-05-10 14:39:16 +0200
committerDavid Baker <dave@matrix.org>2016-05-10 14:39:16 +0200
commitc00b484eff179257f34eeb48be98bb9435598f5e (patch)
treedf8a92459e7310470196189e06c0d455fdd4a85a
parentAdd config option to not send email notifs for new users (diff)
downloadsynapse-c00b484eff179257f34eeb48be98bb9435598f5e.tar.xz
More consistent config naming
-rw-r--r--synapse/config/emailconfig.py2
-rw-r--r--synapse/rest/client/v2_alpha/register.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py
index b239619c9e..90bdd08f00 100644
--- a/synapse/config/emailconfig.py
+++ b/synapse/config/emailconfig.py
@@ -65,7 +65,7 @@ class EmailConfig(Config):
             self.email_template_dir = email_config["template_dir"]
             self.email_notif_template_html = email_config["notif_template_html"]
             self.email_notif_template_text = email_config["notif_template_text"]
-            self.email_notifs_for_new_users = email_config.get(
+            self.email_notif_for_new_users = email_config.get(
                 "notif_for_new_users", True
             )
             if "app_name" in email_config:
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py
index ad04383555..1ecc02d94d 100644
--- a/synapse/rest/client/v2_alpha/register.py
+++ b/synapse/rest/client/v2_alpha/register.py
@@ -221,7 +221,7 @@ class RegisterRestServlet(RestServlet):
                     # notifs are set up on a home server)
                     if (
                         self.hs.config.email_enable_notifs and
-                        self.hs.config.email_notifs_for_new_users
+                        self.hs.config.email_notif_for_new_users
                     ):
                         # Pull the ID of the access token back out of the db
                         # It would really make more sense for this to be passed