Automated merge from 21.0 to 22.0 by tool pullmerge.sh

This commit is contained in:
Laurent Destailleur 2026-03-04 19:50:16 +01:00
commit 3a15740c73

View file

@ -668,7 +668,10 @@ class Notify
$application = (preg_match('/^\+/', $applicationcustom) ? $application : '').$applicationcustom;
}
$from = getDolGlobalString('NOTIFICATION_EMAIL_FROM', getDolGlobalString('MAIN_MAIL_EMAIL_FROM'));
$from = getDolGlobalString('NOTIFICATION_EMAIL_FROM');
if (empty($from)) {
$from = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
}
$object_type = '';
$link = '';