diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2008-10-13 19:19:49 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2008-10-13 19:19:49 +0200 |
| commit | 6aff471eb02f24490c44ec5d4ad9dec09984956d (patch) | |
| tree | 2d551b0214ef12373cb8fcd1044e342ce6284d03 | |
| parent | 056cb2ccb4da10b9edc056f5ad283299f4524416 (diff) | |
| download | rpg-6aff471eb02f24490c44ec5d4ad9dec09984956d.tar.gz rpg-6aff471eb02f24490c44ec5d4ad9dec09984956d.tar.bz2 | |
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
| -rw-r--r-- | inc/mail.php | 6 |
1 files changed, 0 insertions, 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'); |