maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix a regression from calling read_templates. (#8252)

Browse source 
Regressed in #8037.
This commit is contained in:
Patrick Cloke 2020-09-04 09:10:33 -04:00 committed by GitHub
parent e351298444
commit db7de4d182
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/8252.feature Normal file
View file

@ -0,0 +1 @@
Use the default template file when its equivalent is not found in a custom template directory.

2
synapse/config/saml2_config.py
View file

@ -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