diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-09-04 09:10:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 09:10:33 -0400 |
| commit | db7de4d182e68d5ab0b6a1bd0802e0a692214214 (patch) | |
| tree | b2bfec554d52f30a0ff33fd35eb33f29d2fd9644 | |
| parent | Fix type signature in simple_select_one_onecol and friends (#8241) (diff) | |
| download | synapse-db7de4d182e68d5ab0b6a1bd0802e0a692214214.tar.xz | |
Fix a regression from calling read_templates. (#8252)
Regressed in #8037.
| -rw-r--r-- | changelog.d/8252.feature | 1 | ||||
| -rw-r--r-- | synapse/config/saml2_config.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/8252.feature b/changelog.d/8252.feature new file mode 100644 index 0000000000..7e69b72429 --- /dev/null +++ b/changelog.d/8252.feature @@ -0,0 +1 @@ +Use the default template file when its equivalent is not found in a custom template directory. diff --git a/synapse/config/saml2_config.py b/synapse/config/saml2_config.py index 036f8c0e90..cc7401888b 100644 --- a/synapse/config/saml2_config.py +++ b/synapse/config/saml2_config.py @@ -171,7 +171,7 @@ class SAML2Config(Config): self.saml2_error_html_template = self.read_templates( ["saml_error.html"], saml2_config.get("template_dir") - ) + )[0] def _default_saml_config_dict( self, required_attributes: set, optional_attributes: set |