mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reapply charset quiting fix

This commit is contained in:
Synchro 2012-04-27 21:54:57 +02:00
parent 06aff1b403
commit fb70deb117
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
class.phpmailer.php
View File

@ -1259,7 +1259,7 @@ class PHPMailer {
switch($this->message_type) { switch($this->message_type) {
case 'plain': case 'plain':
$result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding); $result .= $this->HeaderLine('Content-Transfer-Encoding', $this->Encoding);
$result .= $this->TextLine('Content-Type: '.$this->ContentType.'; charset="'.$this->CharSet.'"'); $result .= $this->TextLine('Content-Type: '.$this->ContentType.'; charset='.$this->CharSet);
break; break;
case 'inline': case 'inline':
$result .= $this->HeaderLine('Content-Type', 'multipart/related;'); $result .= $this->HeaderLine('Content-Type', 'multipart/related;');
@ -1444,7 +1444,7 @@ class PHPMailer {
$encoding = $this->Encoding; $encoding = $this->Encoding;
} }
$result .= $this->TextLine('--' . $boundary); $result .= $this->TextLine('--' . $boundary);
$result .= sprintf("Content-Type: %s; charset=\"%s\"", $contentType, $charSet); $result .= sprintf("Content-Type: %s; charset=%s", $contentType, $charSet);
$result .= $this->LE; $result .= $this->LE;
$result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding); $result .= $this->HeaderLine('Content-Transfer-Encoding', $encoding);
$result .= $this->LE; $result .= $this->LE;