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

MINOR Fixed inconsistency of using a global $project instead of global project() function in Email

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73652 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-03-25 21:46:48 +00:00
parent bd9778067c
commit 2f2910eac3
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
email/Email.php
View File

@ -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;