adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Setting replyTo and return headers only when defined

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4977 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
mariano.iglesias 2007-05-01 18:01:48 +00:00
parent 874f06a165
commit 2940d81cb0
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cake/libs/controller/components/email.php
View file

@ -312,8 +312,12 @@ class EmailComponent extends Object{
*/
function __createHeader(){
$this->__header .= 'From: ' . $this->__formatAddress($this->from) . $this->_newLine;
$this->__header .= 'Reply-To: ' . $this->__formatAddress($this->replyTo) . $this->_newLine;
$this->__header .= 'Return-Path: ' . $this->__formatAddress($this->return) . $this->_newLine;
if (!empty($this->replyTo)) {
$this->__header .= 'Reply-To: ' . $this->__formatAddress($this->replyTo) . $this->_newLine;
}
if (!empty($this->return)) {
$this->__header .= 'Return-Path: ' . $this->__formatAddress($this->return) . $this->_newLine;
}
$addresses = null;
if(!empty($this->cc)) {
@ -321,7 +325,6 @@ class EmailComponent extends Object{
$addresses .= $this->__formatAddress($cc) . ', ';
}
$this->__header .= 'cc: ' . $addresses . $this->_newLine;
//$this->to .= ', ' . $addresses;
}
$addresses = null;
if(!empty($this->bcc)) {
@ -329,7 +332,6 @@ class EmailComponent extends Object{
$addresses .= $this->__formatAddress($bcc) . ', ';
}
$this->__header .= 'Bcc: ' . $addresses . $this->_newLine;
//$this->to .= ', ' . $addresses;
}
$this->__header .= 'X-Mailer: ' . $this->xMailer . $this->_newLine;