Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
This commit is contained in:
commit
3a0b3fd8a8
2 changed files with 1 additions and 2 deletions
|
|
@ -370,7 +370,7 @@ if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPO
|
|||
$action = 'presend';
|
||||
} else {
|
||||
$result = $mailfile->sendfile();
|
||||
if ($result >= 0) {
|
||||
if ($result) {
|
||||
// Initialisation of datas of object to call trigger
|
||||
if (is_object($object)) {
|
||||
if (empty($actiontypecode)) {
|
||||
|
|
|
|||
|
|
@ -1194,7 +1194,6 @@ class CMailFile
|
|||
}
|
||||
|
||||
error_reporting($errorlevel); // Reactive niveau erreur origine
|
||||
|
||||
return $res;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue