Automated merge from 21.0 to 22.0 by tool pullmerge.sh
This commit is contained in:
commit
3a15740c73
1 changed files with 4 additions and 1 deletions
|
|
@ -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 = '';
|
||||
|
|
|
|||
Loading…
Reference in a new issue