Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2021-02-24 06:16:34 +01:00
commit 2fd21b9792

View File

@ -133,6 +133,7 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
} }
$bodyhtml = ''; $bodyhtml = '';
if(isset($params['__body_html__']) || getMLText($messagekey.'_html')) {
if(!isset($params['__skip_header__']) || !$params['__skip_header__']) { if(!isset($params['__skip_header__']) || !$params['__skip_header__']) {
if(!isset($params['__header_html__'])) if(!isset($params['__header_html__']))
$bodyhtml .= getMLText("email_header_html", $params, "", $lang)."\r\n\r\n"; $bodyhtml .= getMLText("email_header_html", $params, "", $lang)."\r\n\r\n";
@ -149,6 +150,7 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
elseif($params['__footer_html__']) elseif($params['__footer_html__'])
$bodyhtml .= "\r\n\r\n".getMLText($params['__footer_html__'], $params, "", $lang); $bodyhtml .= "\r\n\r\n".getMLText($params['__footer_html__'], $params, "", $lang);
} }
}
$mime = new Mail_mime(array('eol' => "\n")); $mime = new Mail_mime(array('eol' => "\n"));