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

Encoding subject without modifying original, fixes #4489

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6683 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
mariano.iglesias 2008-04-17 22:12:58 +00:00
parent 9af317b1b4
commit 5f967487bb
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -288,7 +288,6 @@ class EmailComponent extends Object{
* @access public * @access public
*/ */
function send($content = null, $template = null, $layout = null) { function send($content = null, $template = null, $layout = null) {
$this->subject = $this->__encode($this->subject);
$this->__createHeader(); $this->__createHeader();
if ($template) { if ($template) {
@ -458,7 +457,7 @@ class EmailComponent extends Object{
$this->__header .= 'Bcc: ' . substr($addresses, 2) . $this->_newLine; $this->__header .= 'Bcc: ' . substr($addresses, 2) . $this->_newLine;
} }
if ($this->delivery == 'smtp') { if ($this->delivery == 'smtp') {
$this->__header .= 'Subject: ' . $this->subject . $this->_newLine; $this->__header .= 'Subject: ' . $this->__encode($this->subject) . $this->_newLine;
} }
$this->__header .= 'X-Mailer: ' . $this->xMailer . $this->_newLine; $this->__header .= 'X-Mailer: ' . $this->xMailer . $this->_newLine;
@ -638,9 +637,9 @@ class EmailComponent extends Object{
*/ */
function __mail() { function __mail() {
if (ini_get('safe_mode')) { if (ini_get('safe_mode')) {
return @mail($this->to, $this->subject, $this->__message, $this->__header); return @mail($this->to, $this->__encode($this->subject), $this->__message, $this->__header);
} }
return @mail($this->to, $this->subject, $this->__message, $this->__header, $this->additionalParams); return @mail($this->to, $this->__encode($this->subject), $this->__message, $this->__header, $this->additionalParams);
} }
/** /**
* Sends out email via SMTP * Sends out email via SMTP