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

Merge pull request #7574 from dhensby/pulls/4.0/email-render-fix

Browse Source 
FIX Make sure plain parts are rendered when re-rendering emails
This commit is contained in:
Damian Mooyman 2017-11-09 12:24:32 +13:00 committed by GitHub
commit d73b285671
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -621,6 +621,12 @@ class Email extends ViewableData
*/
public function setBody($body)
{
$plainPart = $this->findPlainPart();
if ($plainPart) {
$this->getSwiftMessage()->detach($plainPart);
}
unset($plainPart);
$body = HTTP::absoluteURLs($body);
$this->getSwiftMessage()->setBody($body);
@ -856,6 +862,12 @@ class Email extends ViewableData
*/
public function generatePlainPartFromBody()
{
$plainPart = $this->findPlainPart();
if ($plainPart) {
$this->getSwiftMessage()->detach($plainPart);
}
unset($plainPart);
$this->getSwiftMessage()->addPart(
Convert::xml2raw($this->getBody()),
'text/plain',