gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2026-01-31 13:39:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pass null instead of "" as default text to translate()

Browse Source
This commit is contained in:
Uwe Steinmann 2025-10-29 16:50:50 +01:00
parent c86bd865c2
commit 4935fb3c9e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
inc/inc.ClassEmailNotify.php
View File

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