summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2013-01-18 11:16:53 +0100
committerAndreas Gohr <andi@splitbrain.org>2013-01-18 11:16:53 +0100
commit29c964eb1ccaac4204b31ac7409bd91e93e9ed0c (patch)
tree12b939214a73f4db69ab7673fe4c5add9f38bf97 /inc
parent903e04c3aaaad8e237d8e50434aed40692672a43 (diff)
downloadrpg-29c964eb1ccaac4204b31ac7409bd91e93e9ed0c.tar.gz
rpg-29c964eb1ccaac4204b31ac7409bd91e93e9ed0c.tar.bz2
readded mailfromnobody to subscription sending
this was lost because the subscription branch, branched before this change in master
Diffstat (limited to 'inc')
-rw-r--r--inc/subscription.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/inc/subscription.php b/inc/subscription.php
index e4cabffed..dfb3533fd 100644
--- a/inc/subscription.php
+++ b/inc/subscription.php
@@ -546,6 +546,7 @@ class Subscription {
*/
protected function send($subscriber_mail, $subject, $context, $template, $trep, $hrep = null) {
global $lang;
+ global $conf;
$text = rawLocale($template);
$subject = $lang['mail_'.$subject].' '.$context;
@@ -553,6 +554,7 @@ class Subscription {
$mail->bcc($subscriber_mail);
$mail->subject($subject);
$mail->setBody($text, $trep, $hrep);
+ $mail->from($conf['mailfromnobody']);
if(isset($trep['SUBSCRIBE'])) {
$mail->setHeader('List-Unsubscribe', '<'.$trep['SUBSCRIBE'].'>', false);
}