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

anoadragon453 · anoadragon453 · commit df5db3f29324 · 2020-02-25T11:36:21.000Z
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
@@ -271,7 +271,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
@@ -298,7 +298,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 @@`
	`1`	`+Add the ability to send registration emails from the homeserver rather than delegating to an identity server.`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ def on_GET(self, request, medium):`
`271`	`271`	`request.setResponseCode(e.code)`
`272`	`272`
`273`	`273`	`# Show a failure page with a reason`
`274`		`- html_template = load_jinja2_templates(`
	`274`	`+ html_template, = load_jinja2_templates(`
`275`	`275`	`self.config.email_template_dir,`
`276`	`276`	`[self.config.email_password_reset_template_failure_html],`
`277`	`277`	`)`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ def on_GET(self, request, medium):`
`298`	`298`	`request.setResponseCode(e.code)`
`299`	`299`
`300`	`300`	`# Show a failure page with a reason`
`301`		`- html_template = load_jinja2_templates(`
	`301`	`+ html_template, = load_jinja2_templates(`
`302`	`302`	`self.config.email_template_dir,`
`303`	`303`	`[self.config.email_registration_template_failure_html],`
`304`	`304`	`)`