tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FIX email rendering should not include requirements

Browse Source 
If no body is defined, the email is rendered according to a template. Clearing requirements prevent unnecessary styles/scripts to be included in the html (and that needs to be processed/stripped down the line).
This commit is contained in:
Thomas Portelange 2018-08-14 17:26:31 +02:00 committed by Robbie Averill
parent 1ad2d6535e
commit 27ac001d5b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Control/Email/Email.php
View File

@ -790,6 +790,9 @@ class Email extends ViewableData
return $this; return $this;
} }
// Do not interfere with emails styles
Requirements::clear();
// Render plain part // Render plain part
if ($plainTemplate && !$plainPart) { if ($plainTemplate && !$plainPart) {
$plainPart = $this->renderWith($plainTemplate, $this->getData()); $plainPart = $this->renderWith($plainTemplate, $this->getData());
@ -807,6 +810,9 @@ class Email extends ViewableData
$plainPart = $htmlPartObject->Plain(); $plainPart = $htmlPartObject->Plain();
} }
// Rendering is finished
Requirements::restore();
// Fail if no email to send // Fail if no email to send
if (!$plainPart && !$htmlPart) { if (!$plainPart && !$htmlPart) {
return $this; return $this;