From 6cd7e49ba5bd41e3345b5cc4418f1e71476b3991 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 25 Jan 2013 10:58:15 +0100
Subject: [PATCH] only use mailfromnobody for bulk mails
---
inc/subscription.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/inc/subscription.php b/inc/subscription.php
index 6d62e4ced..62cfd1509 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -554,7 +554,9 @@ class Subscription {
$mail->bcc($subscriber_mail);
$mail->subject($subject);
$mail->setBody($text, $trep, $hrep);
- $mail->from($conf['mailfromnobody']);
+ if(in_array($template, array('subscr_list', 'subscr_digest'))){
+ $mail->from($conf['mailfromnobody']);
+ }
if(isset($trep['SUBSCRIBE'])) {
$mail->setHeader('List-Unsubscribe', '<'.$trep['SUBSCRIBE'].'>', false);
}
--
GitLab