pass null as default text to getMLText() in order to default to en_GB

This commit is contained in:
Uwe Steinmann 2025-10-22 08:08:29 +02:00
parent 0b5b585d6f
commit cb9ed2f861

View File

@ -125,38 +125,38 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
$body = ''; $body = '';
if(!isset($params['__skip_header__']) || !$params['__skip_header__']) { if(!isset($params['__skip_header__']) || !$params['__skip_header__']) {
if(!isset($params['__header__'])) if(!isset($params['__header__']))
$body .= getMLText("email_header", $params, "", $lang)."\r\n\r\n"; $body .= getMLText("email_header", $params, null, $lang)."\r\n\r\n";
elseif($params['__header__']) elseif($params['__header__'])
$body .= getMLText($params['__header__'], $params, "", $lang)."\r\n\r\n"; $body .= getMLText($params['__header__'], $params, null, $lang)."\r\n\r\n";
} }
if(isset($params['__body__'])) if(isset($params['__body__']))
$body .= $params['__body__']; $body .= $params['__body__'];
else else
$body .= getMLText($messagekey, $params, "", $lang); $body .= getMLText($messagekey, $params, null, $lang);
if(!isset($params['__skip_footer__']) || !$params['__skip_footer__']) { if(!isset($params['__skip_footer__']) || !$params['__skip_footer__']) {
if(!isset($params['__footer__'])) if(!isset($params['__footer__']))
$body .= "\r\n\r\n".getMLText("email_footer", $params, "", $lang); $body .= "\r\n\r\n".getMLText("email_footer", $params, null, $lang);
elseif($params['__footer__']) elseif($params['__footer__'])
$body .= "\r\n\r\n".getMLText($params['__footer__'], $params, "", $lang); $body .= "\r\n\r\n".getMLText($params['__footer__'], $params, null, $lang);
} }
$bodyhtml = ''; $bodyhtml = '';
if(isset($params['__body_html__']) || getMLText($messagekey.'_html', $params, "", $lang)) { if(isset($params['__body_html__']) || getMLText($messagekey.'_html', $params, null, $lang)) {
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, null, $lang)."\r\n\r\n";
elseif($params['__header_html__']) elseif($params['__header_html__'])
$bodyhtml .= getMLText($params['__header_html__'], $params, "", $lang)."\r\n\r\n"; $bodyhtml .= getMLText($params['__header_html__'], $params, null, $lang)."\r\n\r\n";
} }
if(isset($params['__body_html__'])) if(isset($params['__body_html__']))
$bodyhtml .= $params['__body_html__']; $bodyhtml .= $params['__body_html__'];
else else
$bodyhtml .= getMLText($messagekey.'_html', $params, "", $lang); $bodyhtml .= getMLText($messagekey.'_html', $params, null, $lang);
if(!isset($params['__skip_footer__']) || !$params['__skip_footer__']) { if(!isset($params['__skip_footer__']) || !$params['__skip_footer__']) {
if(!isset($params['__footer_html__'])) if(!isset($params['__footer_html__']))
$bodyhtml .= "\r\n\r\n".getMLText("email_footer_html", $params, "", $lang); $bodyhtml .= "\r\n\r\n".getMLText("email_footer_html", $params, null, $lang);
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, null, $lang);
} }
} }
@ -239,7 +239,7 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
if (isset($GLOBALS['SEEDDMS_HOOKS']['mailqueue'])) { if (isset($GLOBALS['SEEDDMS_HOOKS']['mailqueue'])) {
foreach($GLOBALS['SEEDDMS_HOOKS']['mailqueue'] as $queueService) { foreach($GLOBALS['SEEDDMS_HOOKS']['mailqueue'] as $queueService) {
if(method_exists($queueService, 'queueMailJob')) { if(method_exists($queueService, 'queueMailJob')) {
$ret = $queueService->queueMailJob($mail_params, $to, $hdrs, getMLText($subject, $params, "", $lang), $message); $ret = $queueService->queueMailJob($mail_params, $to, $hdrs, getMLText($subject, $params, null, $lang), $message);
if($ret !== null) if($ret !== null)
return $ret; return $ret;
} }