diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-08-15 16:27:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-15 16:27:11 +0100 |
| commit | b13cac896d4f9bfd946517e96676394e2975e54b (patch) | |
| tree | 25883b13d5b1690d3b4059f906fc9349e09bcc80 /synapse/rest/client/v2_alpha/account.py | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-b13cac896d4f9bfd946517e96676394e2975e54b.tar.xz | |
Fix up password reset template config names (#5863)
Fixes #5833 The emailconfig code was attempting to pull incorrect config file names. This corrects that, while also marking a difference between a config file variable that's a filepath versus a str containing HTML.
Diffstat (limited to 'synapse/rest/client/v2_alpha/account.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/account.py | 4 |
1 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 7ac456812a..934ed5d16d 100644 --- a/synapse/rest/client/v2_alpha/account.py +++ b/synapse/rest/client/v2_alpha/account.py @@ -282,13 +282,13 @@ class PasswordResetSubmitTokenServlet(RestServlet): return None # Otherwise show the success template - html = self.config.email_password_reset_success_html_content + html = self.config.email_password_reset_template_success_html_content request.setResponseCode(200) except ThreepidValidationError as e: # Show a failure page with a reason html = self.load_jinja2_template( self.config.email_template_dir, - self.config.email_password_reset_failure_template, + self.config.email_password_reset_template_failure_html, template_vars={"failure_reason": e.msg}, ) request.setResponseCode(e.code) |