Merge pull request #9070 from kinglozzer/email-plaintext

FIX: Email::render() generating object instead of string for plaintext part (fixes #9069)
silverstripe · Jul 2, 2019 · ad05099 · ad05099
2 parents fd88003 + 8e87264
commit ad05099
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Control/Email/Email.php b/src/Control/Email/Email.php
@@ -792,10 +792,10 @@ public function render($plainOnly = false)
 
         // 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 @@ public function render($plainOnly = false)
             $htmlPartObject = DBField::create_field('HTMLFragment', $htmlPart);
             $plainPart = $htmlPartObject->Plain();
         }
-        
+
         // Rendering is finished
         Requirements::restore();