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

Fix destructuring assumption bug with using load_jinja2_templates
This commit is contained in:
Erik Johnston
2019-09-06 13:54:25 +01:00
committed by GitHub
3 changed files with 3 additions and 2 deletions
+1
View File
@@ -0,0 +1 @@
Add the ability to send registration emails from the homeserver rather than delegating to an identity server.
+1 -1
View File
@@ -261,7 +261,7 @@ class PasswordResetSubmitTokenServlet(RestServlet):
request.setResponseCode(e.code)
# 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_password_reset_template_failure_html],
)
+1 -1
View File
@@ -293,7 +293,7 @@ class RegistrationSubmitTokenServlet(RestServlet):
request.setResponseCode(e.code)
# 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_registration_template_failure_html],
)