diff options
| author | Erik Johnston <erik@matrix.org> | 2021-08-18 17:02:47 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-08-18 17:02:47 +0100 |
| commit | 78a70a2e0bdff5bdf02ba093eefab0b16ebefd73 (patch) | |
| tree | 8de7b7805a9840101b00529a50812d6ffcb99cc4 /synapse/config/account_validity.py | |
| parent | Fix weakref_slot parameter for room member storage attrs. (#10642) (diff) | |
| parent | Update docs/upgrade.md with new version (diff) | |
| download | synapse-78a70a2e0bdff5bdf02ba093eefab0b16ebefd73.tar.xz | |
Merge branch 'release-v1.41' into develop
Diffstat (limited to 'synapse/config/account_validity.py')
| -rw-r--r-- | synapse/config/account_validity.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/config/account_validity.py b/synapse/config/account_validity.py index 9acce5996e..52e63ab1f6 100644 --- a/synapse/config/account_validity.py +++ b/synapse/config/account_validity.py @@ -78,6 +78,11 @@ class AccountValidityConfig(Config): ) # Read and store template content + custom_template_directories = ( + self.root.server.custom_template_directory, + account_validity_template_dir, + ) + ( self.account_validity_account_renewed_template, self.account_validity_account_previously_renewed_template, @@ -88,5 +93,5 @@ class AccountValidityConfig(Config): "account_previously_renewed.html", invalid_token_template_filename, ], - (td for td in (account_validity_template_dir,) if td), + (td for td in custom_template_directories if td), ) |