mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 23:10:20 +00:00
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:
commit
5624d0f2ec
3 changed files with 3 additions and 2 deletions
1
changelog.d/5994.feature
Normal file
1
changelog.d/5994.feature
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Add the ability to send registration emails from the homeserver rather than delegating to an identity server.
|
|
@ -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],
|
||||||
)
|
)
|
||||||
|
|
|
@ -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],
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue