Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
beb19cf6
Unverified
Commit
beb19cf6
authored
5 years ago
by
Brendan Abolivier
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix buggy condition in account validity handler (#7074)
parent
d8d91983
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/7074.bugfix
+1
-0
1 addition, 0 deletions
changelog.d/7074.bugfix
synapse/handlers/account_validity.py
+5
-1
5 additions, 1 deletion
synapse/handlers/account_validity.py
with
6 additions
and
1 deletion
changelog.d/7074.bugfix
0 → 100644
+
1
−
0
View file @
beb19cf6
Fix a bug causing account validity renewal emails to be sent even if the feature is turned off in some cases.
This diff is collapsed.
Click to expand it.
synapse/handlers/account_validity.py
+
5
−
1
View file @
beb19cf6
...
@@ -44,7 +44,11 @@ class AccountValidityHandler(object):
...
@@ -44,7 +44,11 @@ class AccountValidityHandler(object):
self
.
_account_validity
=
self
.
hs
.
config
.
account_validity
self
.
_account_validity
=
self
.
hs
.
config
.
account_validity
if
self
.
_account_validity
.
renew_by_email_enabled
and
load_jinja2_templates
:
if
(
self
.
_account_validity
.
enabled
and
self
.
_account_validity
.
renew_by_email_enabled
and
load_jinja2_templates
):
# Don't do email-specific configuration if renewal by email is disabled.
# Don't do email-specific configuration if renewal by email is disabled.
try
:
try
:
app_name
=
self
.
hs
.
config
.
email_app_name
app_name
=
self
.
hs
.
config
.
email_app_name
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment