From c9e62927f29991ca32e21215e6647b37962c84dc Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Thu, 30 Apr 2015 14:34:09 +0100
Subject: [PATCH] Use disable_registration keys if they are present

---
 synapse/config/registration.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index 82684e4dc9..095c3d3b00 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -26,6 +26,11 @@ class RegistrationConfig(Config):
         self.disable_registration = not bool(
             distutils.util.strtobool(str(config["enable_registration"]))
         )
+        if "disable_registration" in config:
+            self.disable_registration = bool(
+                distutils.util.strtobool(str(config["disable_registration"]))
+            )
+
         self.registration_shared_secret = config.get("registration_shared_secret")
 
     def default_config(self, config_dir, server_name):