From bf67f48aac9bdbbe6c15ae662023dd93de686e98 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Fri, 18 Sep 2009 03:04:57 +0000
Subject: [PATCH] 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
---
 email/Email.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/email/Email.php b/email/Email.php
index 40688488e..79c8f1eaf 100755
--- a/email/Email.php
+++ b/email/Email.php
@@ -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) {