summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-12-04 15:42:33 +0000
committerGitHub <noreply@github.com>2019-12-04 15:42:33 +0000
commitb9449012db6abbeacb543025313954ccd2580146 (patch)
tree69630c272e28207fc6cbf70e779e603695d04ea3
parentMerge pull request #6329 from matrix-org/babolivier/context_filters (diff)
parentAdd changelog file (diff)
downloadsynapse-b9449012db6abbeacb543025313954ccd2580146.tar.xz
Merge pull request #6441 from syamgk/fix-parameter-mismatch
Fix issue #6406 parameter mismatch
-rw-r--r--changelog.d/6406.bugfix1
-rw-r--r--synapse/handlers/register.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/6406.bugfix b/changelog.d/6406.bugfix
new file mode 100644
index 0000000000..ca9bee084b
--- /dev/null
+++ b/changelog.d/6406.bugfix
@@ -0,0 +1 @@
+Fix bug: TypeError in `register_user()` while using LDAP auth module.
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 95806af41e..8a7d965feb 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -266,7 +266,7 @@ class RegistrationHandler(BaseHandler):
             }
 
             # Bind email to new account
-            yield self._register_email_threepid(user_id, threepid_dict, None, False)
+            yield self._register_email_threepid(user_id, threepid_dict, None)
 
         return user_id