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

Merged in Email template codes change from branches/2.3 - r84594

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86678 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-09-18 03:04:57 +00:00
parent b77d088d47
commit bf67f48aac
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
email/Email.php
View File

@ -337,11 +337,6 @@ class Email extends ViewableData {
// Parse $ variables in the base parameters // Parse $ variables in the base parameters
$data = $this->templateData(); $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 // Process a .SS template file
$fullBody = $this->body; $fullBody = $this->body;
if($this->ss_template && !$isPlain) { if($this->ss_template && !$isPlain) {