diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 07f5dd234e9..cb5a165164f 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -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)); } } diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index c79b4b321ca..89bf13da263 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -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 = '';