Skip to content
Snippets Groups Projects
Commit 6aff471e authored by Andreas Gohr's avatar Andreas Gohr
Browse files

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
parent 056cb2cc
No related branches found
No related tags found
No related merge requests found
......@@ -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');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment