diff options
author | Erik Johnston <erik@matrix.org> | 2019-09-06 13:54:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-06 13:54:25 +0100 |
commit | 5624d0f2ec09ce706998221b8adad2d18521bcda (patch) | |
tree | 5e76eca1679337f39592f7288d1c31a9fc4ddd57 /synapse | |
parent | Merge pull request #5991 from matrix-org/erikj/fix_tracing_funcs (diff) | |
parent | Apply suggestions from code review (diff) | |
download | synapse-5624d0f2ec09ce706998221b8adad2d18521bcda.tar.xz |
Merge pull request #5994 from matrix-org/anoa/html_template_fix
Fix destructuring assumption bug with using load_jinja2_templates
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 2 | ||||
-rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v2_alpha/account.py b/synapse/rest/client/v2_alpha/account.py index 997557dfb0..785d01ea52 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -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], ) diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index 7ab534581e..5c7a5f3579 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -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], ) |