summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-19 16:18:49 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-19 16:18:49 +0000
commitfe1d23733897d82e8a4eb937f8746aab1a6e849f (patch)
tree165d3adc25484dd26583b0a6ed7aa5374f008ad1
parentMerge pull request #6329 from matrix-org/babolivier/context_filters (diff)
parentMerge pull request #6441 from syamgk/fix-parameter-mismatch (diff)
downloadsynapse-fe1d23733897d82e8a4eb937f8746aab1a6e849f.tar.xz
Merge pull request #6441 from syamgk/fix-parameter-mismatch
* commit 'b9449012d':
  Add changelog file
  Issue #6406 Fix 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 f1b059986d..099611d79e 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py
@@ -278,7 +278,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) # Prevent the new user from showing up in the user directory if the server # mandates it.