Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix destructuring assumption bug with using load_jinja2_templates #5994

Merged
merged 3 commits into from
Sep 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5994.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add the ability to send registration emails from the homeserver rather than delegating to an identity server.
2 changes: 1 addition & 1 deletion synapse/rest/client/v2_alpha/account.py
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ def on_GET(self, request, medium):
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],
)
Expand Down
2 changes: 1 addition & 1 deletion synapse/rest/client/v2_alpha/register.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ def on_GET(self, request, medium):
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],
)
Expand Down