Merge branch 'fronkdev' into 'master'
Added explicit UTF-8 encoding to all HTML emails See merge request fronk/thetool!1466
This commit is contained in:
@@ -45,7 +45,7 @@ class MailtemplateDispatch extends mfBaseModel {
|
|||||||
if(!$template) return false;
|
if(!$template) return false;
|
||||||
|
|
||||||
if($template->body_html) {
|
if($template->body_html) {
|
||||||
$body = "<html><head></head><body>";
|
$body = '<html lang="de"><head><meta charset="utf-8" /></head><body>';
|
||||||
$body .= $template->renderBody();
|
$body .= $template->renderBody();
|
||||||
$body .= "</body></html>\n"; // explicitly add new line, or some mail clients wont show attachment
|
$body .= "</body></html>\n"; // explicitly add new line, or some mail clients wont show attachment
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -384,7 +384,7 @@ class Preorder extends mfBaseModel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$subject = $mailtemplate->getVariableReplacedSubject($replacers);
|
$subject = $mailtemplate->getVariableReplacedSubject($replacers);
|
||||||
$body = "<html><head></head><body>";
|
$body = '<html lang="de"><head><meta charset="utf-8" /></head><body>';
|
||||||
$body .= $mailtemplate->renderBody($replacers);
|
$body .= $mailtemplate->renderBody($replacers);
|
||||||
$body .= "</body></html>\n";
|
$body .= "</body></html>\n";
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ class Preordernotification extends mfBaseModel {
|
|||||||
|
|
||||||
public function sendToPreorder(Preorder $preorder, $email_to = false) {
|
public function sendToPreorder(Preorder $preorder, $email_to = false) {
|
||||||
$subject = $this->subject;
|
$subject = $this->subject;
|
||||||
$body = "<html><head></head><body>";
|
$body = '<html lang="de"><head><meta charset="utf-8" /></head><body>';
|
||||||
$body .= $this->replaceBodyVariables($this->body_html, $preorder); // TODO: Variable replacement
|
$body .= $this->replaceBodyVariables($this->body_html, $preorder); // TODO: Variable replacement
|
||||||
$body .= "</body></html>";
|
$body .= "</body></html>";
|
||||||
$body .= "\n"; // explicitlyadd new line, or some mail clients wont show attachment
|
$body .= "\n"; // explicitlyadd new line, or some mail clients wont show attachment
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ function sendPreorderEmail($mailtemplate, $preordercampaign, $preorder, $email_t
|
|||||||
}
|
}
|
||||||
|
|
||||||
$subject = $mailtemplate->getVariableReplacedSubject($replacers);
|
$subject = $mailtemplate->getVariableReplacedSubject($replacers);
|
||||||
$body = "<html><head></head><body>";
|
$body = '<html lang="de"><head><meta charset="utf-8" /></head><body>';
|
||||||
$body .= $mailtemplate->renderBody($replacers);
|
$body .= $mailtemplate->renderBody($replacers);
|
||||||
$body .= "</body></html>\n";
|
$body .= "</body></html>\n";
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user