fix(mail): always reset current user after sending activity emails - #2814
Merged
Conversation
MailQueueHandler::sendEmailToUser() and DigestSender::sendDigestForUser() set the current user on the activity manager but only reset it on the success path. Early returns (no activities for the digest) and failures (mailer errors, exceptions while building the mail — which the digest loop catches and continues) left the activity manager impersonating that user for the remaining users of the same cron run, leaking activity visibility between users. Wrap the impersonated sections in try/finally so the current user is always reset. Signed-off-by: Frank Karlitschek <karlitschek@users.noreply.github.com> Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Member
Author
miaulalala
approved these changes
Jul 22, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
MailQueueHandler::sendEmailToUser() and DigestSender::sendDigestForUser() set the current user on the activity manager but only reset it on the success path. Early returns (no activities for the digest) and failures (mailer errors, exceptions while building the mail — which the digest loop catches and continues) left the activity manager impersonating that user for the remaining users of the same cron run, leaking activity visibility between users.
Wrap the impersonated sections in try/finally so the current user is always reset.
🤖 AI (if applicable)