tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-26 06:29:24 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX Correct formatting of "Content-Type: ...; charset=..." header in HTTPResponse and Mailer (breaks Adobe BrowserLab)

Browse Source
This commit is contained in:
Ingo Schommer 2011-07-15 07:05:50 +02:00
parent a30d31a16a
commit 5e9ba3c1d5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
control/HTTPResponse.php
View File

@ -81,7 +81,7 @@ class SS_HTTPResponse {
* @var array
*/
protected $headers = array(
"Content-Type" => "text/html; charset=\"utf-8\"",
"Content-Type" => "text/html; charset=utf-8",
);
/**

8
email/Mailer.php
View File

@ -66,13 +66,13 @@ function htmlEmail($to, $from, $subject, $htmlContent, $attachedFiles = false, $
$subject = "=?UTF-8?B?" . base64_encode($subject) . "?=";
// Make the plain text part
$headers["Content-Type"] = "text/plain; charset=\"utf-8\"";
$headers["Content-Type"] = "text/plain; charset=utf-8";
$headers["Content-Transfer-Encoding"] = $plainEncoding ? $plainEncoding : "quoted-printable";
$plainPart = processHeaders($headers, ($plainEncoding == "base64") ? chunk_split(base64_encode($plainContent),60) : wordwrap(QuotedPrintable_encode($plainContent),75));
// Make the HTML part
$headers["Content-Type"] = "text/html; charset=\"utf-8\"";
$headers["Content-Type"] = "text/html; charset=utf-8";
// Add basic wrapper tags if the body tag hasn't been given
@ -179,7 +179,7 @@ function plaintextEmail($to, $from, $subject, $plainContent, $attachedFiles, $cu
$subject = "=?UTF-8?B?" . base64_encode($subject) . "?=";
// Make the plain text part
$headers["Content-Type"] = "text/plain; charset=\"utf-8\"";
$headers["Content-Type"] = "text/plain; charset=utf-8";
$headers["Content-Transfer-Encoding"] = $plainEncoding ? $plainEncoding : "quoted-printable";
$plainContent = ($plainEncoding == "base64") ? chunk_split(base64_encode($plainContent),60) : QuotedPrintable_encode($plainContent);
@ -284,7 +284,7 @@ function wrapImagesInline($htmlContent) {
// Make the HTML part
$headers["Content-Type"] = "text/html; charset=\"utf-8\"";
$headers["Content-Type"] = "text/html; charset=utf-8";
$headers["Content-Transfer-Encoding"] = "quoted-printable";
$multiparts[] = processHeaders($headers, QuotedPrintable_encode($replacedContent));