Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Fix a regression from calling read_templates. #8252

Merged
merged 1 commit into from
Sep 4, 2020
Merged

Fix a regression from calling read_templates. #8252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/8252.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use the default template file when its equivalent is not found in a custom template directory.
2 changes: 1 addition & 1 deletion synapse/config/saml2_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def read_config(self, config, **kwargs):

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
Expand Down