Repository navigation
Preserve literal email text when templating is not requested - #541
Merged
Merged
Conversation
Render subject, plain text and HTML only when a template or explicit context is supplied. Preserve literal template-like text in ordinary emails, while retaining rendering for an explicit empty context. Add direct creation and Django email-backend regression coverage. Fixes ui#478. Validation: full suites on Django 4.2.30 and 6.1.2; formatting check.
Collaborator
|
@amanjain can you fix the conflict? You can also ignore the changelog when opening a PR, I'll fill out the changelog and give credits before I make a release. |
Contributor
Author
|
@selwin I’ve merged the latest master and resolved the conflict, leaving the changelog unchanged from master as requested. |
Collaborator
|
Thanks! |
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
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.
Send subject, plain text and HTML literally when no template or context is supplied. Preserve template rendering when context is explicitly provided, including an empty dictionary.
Includes regression tests and a changelog entry.
Fixes #478. Split from #539 as requested.
Validation: full test suites passed on Django 4.2.30 and 6.1.2; formatting checks passed.
@selwin ready for review.
@JestemStefan @nortigo @jamespanic could you verify this against your reported case?