Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into 21.0
This commit is contained in:
commit
7bb2713bd9
2 changed files with 5 additions and 2 deletions
|
|
@ -172,7 +172,7 @@ if (empty($reshook)) {
|
|||
}
|
||||
}
|
||||
|
||||
$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOSTINT($key));
|
||||
$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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