mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-09-27 11:56:23 +02:00
Merged in Email template codes change from branches/2.3 - r84594
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86678 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
b77d088d47
commit
bf67f48aac
@ -337,11 +337,6 @@ class Email extends ViewableData {
|
||||
// Parse $ variables in the base parameters
|
||||
$data = $this->templateData();
|
||||
|
||||
foreach(array('from','to','subject','body', 'plaintext_body', 'cc', 'bcc') as $param) {
|
||||
$template = SSViewer::fromString($this->$param);
|
||||
$this->$param = $template->process($data);
|
||||
}
|
||||
|
||||
// Process a .SS template file
|
||||
$fullBody = $this->body;
|
||||
if($this->ss_template && !$isPlain) {
|
||||
|
Loading…
Reference in New Issue
Block a user