mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-07 21:41:56 +00:00
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/acl_perf
This commit is contained in:
commit
2e35a733cc
@ -44,7 +44,7 @@ class IdentityHandler(BaseHandler):
|
||||
http_client = SimpleHttpClient(self.hs)
|
||||
# XXX: make this configurable!
|
||||
# trustedIdServers = ['matrix.org', 'localhost:8090']
|
||||
trustedIdServers = ['matrix.org']
|
||||
trustedIdServers = ['matrix.org', 'vector.im']
|
||||
|
||||
if 'id_server' in creds:
|
||||
id_server = creds['id_server']
|
||||
|
@ -102,7 +102,8 @@ class RegisterRestServlet(RestServlet):
|
||||
if self.hs.config.disable_registration:
|
||||
raise SynapseError(403, "Registration has been disabled")
|
||||
|
||||
yield self.registration_handler.check_username(desired_username)
|
||||
if desired_username is not None:
|
||||
yield self.registration_handler.check_username(desired_username)
|
||||
|
||||
if self.hs.config.enable_registration_captcha:
|
||||
flows = [
|
||||
|
Loading…
Reference in New Issue
Block a user