From 84e01faf1e23750cfda122740e104a687d09abe5 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Tue, 28 Aug 2007 01:55:45 +0000 Subject: [PATCH] Refactored newsletter system to put recipient selection and form-fieldset generation into the NewsletterType class, to allow for subclassing NewsletterType to create special system newsletters. [see oriwave2 for an example] Removed a number of notice-level errors. Allowed for BOUNCE_EMAIL to not exist and bounce-handling to be disabled. git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40963 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/Email.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Email.php b/core/Email.php index ae38c2c1d..dc03810ca 100755 --- a/core/Email.php +++ b/core/Email.php @@ -469,7 +469,7 @@ function htmlEmail($to, $from, $subject, $htmlContent, $attachedFiles = false, $ $headers["From"] = validEmailAddr($from); // Messages with the X-SilverStripeMessageID header can be tracked - if(isset($customheaders["X-SilverStripeMessageID"])) { + if(isset($customheaders["X-SilverStripeMessageID"]) && defined('BOUNCE_EMAIL')) { $bounceAddress = BOUNCE_EMAIL; // Get the human name from the from address, if there is one if(ereg('^([^<>]+)<([^<>])> *$', $from, $parts)) @@ -559,7 +559,7 @@ function plaintextEmail($to, $from, $subject, $plainContent, $attachedFiles, $cu $headers["From"] = validEmailAddr($from); // Messages with the X-SilverStripeMessageID header can be tracked - if(isset($customheaders["X-SilverStripeMessageID"])) { + if(isset($customheaders["X-SilverStripeMessageID"]) && defined('BOUNCE_EMAIL')) { $bounceAddress = BOUNCE_EMAIL; // Get the human name from the from address, if there is one if(ereg('^([^<>]+)<([^<>])> *$', $from, $parts))