From 6aff471eb02f24490c44ec5d4ad9dec09984956d Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 13 Oct 2008 19:19:49 +0200
Subject: [PATCH] reverted the envelope address setting patch
This implementation proved to be troublesome on certain setups. Instead of
breaking possibly a *lot* of working setups to fix a few other systems, we
decided to revert to the previous behavior. Users which can't use this
method for sending mails should consider the swiftmail plugin.
darcs-hash:20081013171949-7ad00-83c336824da6e5428b7d8e06aea7e6d8e8a24f58.gz
---
inc/mail.php | 6 ------
1 file changed, 6 deletions(-)
diff --git a/inc/mail.php b/inc/mail.php
index 1692f415c..4dfc77552 100644
--- a/inc/mail.php
+++ b/inc/mail.php
@@ -90,12 +90,6 @@ function _mail_send_action($data) {
// No named recipients for To: in Windows (see FS#652)
$usenames = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? false : true;
- // On Unix set the envelope headers correctly:
- if($usenames){
- if($from) $params = ((string) $params).' -f '.escapeshellarg(mail_encode_address($from,'',false));
- if($to) $params = ((string) $params).' '.escapeshellarg(mail_encode_address($to,'',false));
- }
-
$to = mail_encode_address($to,'',$usenames);
$header .= mail_encode_address($from,'From');
$header .= mail_encode_address($cc,'Cc');
--
GitLab