OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5994 from matrix-org/anoa/html_template_fix 

Fix destructuring assumption bug with using load_jinja2_templates
pull/6011/head
Erik Johnston 2019-09-06 13:54:25 +01:00 committed by GitHub
parent 146af7b47f cf5a420c8a
commit 5624d0f2ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5994.feature Normal file
View File

@ -0,0 +1 @@
Add the ability to send registration emails from the homeserver rather than delegating to an identity server.

2
synapse/rest/client/v2_alpha/account.py
View File

@ -261,7 +261,7 @@ class PasswordResetSubmitTokenServlet(RestServlet):
request.setResponseCode(e.code) request.setResponseCode(e.code)
# Show a failure page with a reason # Show a failure page with a reason
html_template = load_jinja2_templates( html_template, = load_jinja2_templates(
self.config.email_template_dir, self.config.email_template_dir,
[self.config.email_password_reset_template_failure_html], [self.config.email_password_reset_template_failure_html],
) )

2
synapse/rest/client/v2_alpha/register.py
View File

@ -293,7 +293,7 @@ class RegistrationSubmitTokenServlet(RestServlet):
request.setResponseCode(e.code) request.setResponseCode(e.code)
# Show a failure page with a reason # Show a failure page with a reason
html_template = load_jinja2_templates( html_template, = load_jinja2_templates(
self.config.email_template_dir, self.config.email_template_dir,
[self.config.email_registration_template_failure_html], [self.config.email_registration_template_failure_html],
) )