From 2f2910eac3c8262f72ed8211d242227a2382ee41 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Wed, 25 Mar 2009 21:46:48 +0000 Subject: [PATCH] MINOR Fixed inconsistency of using a global $project instead of global project() function in Email git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73652 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- email/Email.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/email/Email.php b/email/Email.php index 2d0d3f736..510bd2fd4 100755 --- a/email/Email.php +++ b/email/Email.php @@ -374,8 +374,6 @@ class Email extends ViewableData { * Doesn't actually give any indication if the mail has been delivered to the recipient properly) */ function sendPlain($messageID = null) { - global $project; - Requirements::clear(); $this->parseVariables(true); @@ -386,9 +384,9 @@ class Email extends ViewableData { $headers['X-SilverStripeBounceURL'] = $this->bounceHandlerURL; - if($messageID) $headers['X-SilverStripeMessageID'] = $project . '.' . $messageID; + if($messageID) $headers['X-SilverStripeMessageID'] = project() . '.' . $messageID; - if($project) $headers['X-SilverStripeSite'] = $project; + if(project()) $headers['X-SilverStripeSite'] = project(); $to = $this->to; $subject = $this->subject;