[Mailer] require a body renderer only if message has not been rendered yet #48481
Conversation
xabbuh
commented
Dec 5, 2022
| Q | A |
|---|---|
| Branch? | 6.2 |
| Bug fix? | yes |
| New feature? | no |
| Deprecations? | no |
| Tickets | Fix #48472 |
| License | MIT |
| Doc PR |
| @@ -76,7 +76,7 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa | ||
| $envelope = $event->getEnvelope(); | ||
| $message = $event->getMessage(); | ||
|
|
||
| if ($message instanceof TemplatedEmail && ($message->getTextTemplate() || $message->getHtmlTemplate())) { | ||
| if ($message instanceof TemplatedEmail && (!$message->getTextBody() && $message->getTextTemplate() || !$message->getHtmlBody() && $message->getHtmlTemplate())) { |
There was a problem hiding this comment.
Would this be enough?
| if ($message instanceof TemplatedEmail && (!$message->getTextBody() && $message->getTextTemplate() || !$message->getHtmlBody() && $message->getHtmlTemplate())) { | |
| if ($message instanceof TemplatedEmail && (null !== $message->getTextTemplate() || null !== $message->getHtmlTemplate())) { |
There was a problem hiding this comment.
I don't think so. Both methods are overwritten in the NotificationEmail class: https://github.com/symfony/symfony/blob/6.2/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php#L158-L174
There was a problem hiding this comment.
for me
(null !== $message->getTextTemplate() || null !== $message->getHtmlTemplate())
is true, $message->getTextTemplate() is @email/default/notification/body.txt.twig and $message->getHtmlTemplate() is @email/default/notification/body.html.twig
There was a problem hiding this comment.
For my issue #48472 this fixes it:
if ($message instanceof TemplatedEmail && (!$message->getTextBody() && $message->getTextTemplate() || !$message->getHtmlBody() && $message->getHtmlTemplate())) {
There was a problem hiding this comment.
See #48505 for an alternative fix.
|
See #48505 for an alternative fix. |
|
closing in favor of #48505 |
This PR was merged into the 6.2 branch. Discussion ---------- [Mailer] Fix rendered templates for notifications | Q | A | ------------- | --- | Branch? | 6.2 | Bug fix? | yes | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tickets | Fix #48472 | License | MIT | Doc PR | n/a Alternative to #48481 Commits ------- 085185d [Mailer] Fix rendered templates for notifications