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

Fix destructuring assumption bug with using load_jinja2_templates
matrix-org · Sep 6, 2019 · 5624d0f · 5624d0f
2 parents 146af7b + cf5a420
commit 5624d0f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/changelog.d/5994.feature b/changelog.d/5994.feature
@@ -0,0 +1 @@
+Add the ability to send registration emails from the homeserver rather than delegating to an identity server.
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py
@@ -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],
             )

diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py
@@ -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],
             )
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.