adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

updating email component, proper fix for [7052]

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7134 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2008-06-06 18:31:11 +00:00
parent 1c21457eef
commit bd7b09e629
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -330,8 +330,14 @@ class EmailComponent extends Object{
if ($this->_debug) {
return $this->__debug();
}
$__method = '__'.$this->delivery;
return $this->$__method();
$sent = $this->$__method();
$this->__headers = '';
$this->__message = '';
return $sent;
}
/**
* Reset all EmailComponent internal variables to be able to send out a new email.
@ -431,7 +437,7 @@ class EmailComponent extends Object{
* @access private
*/
function __createHeader() {
$this->__header = '';
//$this->__header = '';
if ($this->delivery == 'smtp') {
$this->__header = 'To: ' . $this->__formatAddress($this->to) . $this->_newLine;
}
@ -497,7 +503,6 @@ class EmailComponent extends Object{
* @access private
*/
function __formatMessage($message) {
$this->__message = '';
if (!empty($this->attachments)) {
$this->__message .= '--' . $this->__boundary . $this->_newLine;
$this->__message .= 'Content-Type: text/plain; charset=' . $this->charset . $this->_newLine;
@ -589,7 +594,7 @@ class EmailComponent extends Object{
function __encode($subject) {
$subject = $this->__strip($subject);
if (low($this->charset) !== 'iso-8859-15') {
if (strtolower($this->charset) !== 'iso-8859-15') {
$start = "=?" . $this->charset . "?B?";
$end = "?=";
$spacer = $end . "\n " . $start;