tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-30 00:19:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9070 from kinglozzer/email-plaintext

Browse Source 
FIX: Email::render() generating object instead of string for plaintext part (fixes #9069)
This commit is contained in:
Robbie Averill 2019-07-02 18:47:18 +12:00 committed by GitHub
commit ad050997fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -792,10 +792,10 @@ class Email extends ViewableData
// Do not interfere with emails styles
Requirements::clear();
// Render plain part
if ($plainTemplate && !$plainPart) {
$plainPart = $this->renderWith($plainTemplate, $this->getData());
$plainPart = $this->renderWith($plainTemplate, $this->getData())->Plain();
}
// Render HTML part, either if sending html email, or a plain part is lacking
@ -809,7 +809,7 @@ class Email extends ViewableData
$htmlPartObject = DBField::create_field('HTMLFragment', $htmlPart);
$plainPart = $htmlPartObject->Plain();
}
// Rendering is finished
Requirements::restore();