summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-01-22 16:52:29 +0000
committerNeil Johnson <neil@matrix.org>2019-01-22 16:52:29 +0000
commitd619b113edf2942185a502a91cbf5b51642f6814 (patch)
tree974689abd0c86e184934a8668d08bb59c19dabd2 /synapse/rest
parentMerge pull request #4423 from matrix-org/neilj/disable_msisdn_on_registration (diff)
downloadsynapse-d619b113edf2942185a502a91cbf5b51642f6814.tar.xz
Fix None guard in config.server.is_threepid_reserved
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/register.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py
index 14025cd219..3ab253462b 100644
--- a/synapse/rest/client/v2_alpha/register.py
+++ b/synapse/rest/client/v2_alpha/register.py
@@ -416,7 +416,9 @@ class RegisterRestServlet(RestServlet):
             )
             # Necessary due to auth checks prior to the threepid being
             # written to the db
-            if is_threepid_reserved(self.hs.config, threepid):
+            if is_threepid_reserved(
+                self.hs.config.mau_limits_reserved_threepids, threepid
+            ):
                 yield self.store.upsert_monthly_active_user(registered_user_id)
 
             # remember that we've now registered that user account, and with