vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIX: notification: error 500 in fixed emails due to a bad copy/paste (#29580)

Browse source
This commit is contained in:
Marc de Lima Lucio 2024-05-03 18:12:55 +02:00 committed by GitHub
parent 93fc018cd4
commit 3258b00e16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
htdocs/core/class/notify.class.php
View file

@ -852,23 +852,16 @@ class Notify
// content will be sent.
$mailTemplateLabel = isset($conf->global->{$notifcode.'_TEMPLATE'}) ? $conf->global->{$notifcode.'_TEMPLATE'} : '';
$emailTemplate = null;
// Set output language
$outputlangs = $langs;
if (!empty($mailTemplateLabel)) {
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
$formmail = new FormMail($this->db);
$emailTemplate = $formmail->getEMailTemplate($this->db, $object_type.'_send', $user, $outputlangs, 0, 1, $labeltouse);
$emailTemplate = $formmail->getEMailTemplate($this->db, $object_type.'_send', $user, $langs, 0, 1, $labeltouse);
}
if (!empty($mailTemplateLabel) && is_object($emailTemplate) && $emailTemplate->id > 0) {
if ($obj->default_lang && $obj->default_lang != $langs->defaultlang) {
$outputlangs = new Translate('', $conf);
$outputlangs->setDefaultLang($obj->default_lang);
$outputlangs->loadLangs(array('main', 'other'));
}
$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
complete_substitutions_array($substitutionarray, $outputlangs, $object);
$subject = make_substitutions($emailTemplate->topic, $substitutionarray, $outputlangs);
$message = make_substitutions($emailTemplate->content, $substitutionarray, $outputlangs);
$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $object);
complete_substitutions_array($substitutionarray, $langs, $object);
$subject = make_substitutions($emailTemplate->topic, $substitutionarray, $langs);
$message = make_substitutions($emailTemplate->content, $substitutionarray, $langs);
} else {
$message = '';
$message .= $langs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";