lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

set errors from object

Browse Source
This commit is contained in:
Frédéric FRANCE 2023-02-24 16:45:07 +01:00
parent 093099ea44
commit 3adc7dd2e9
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/adherents/class/adherent.class.php
View File

@ -1726,8 +1726,7 @@ class Adherent extends CommonObject
return -2;
}
} else {
$this->error = $subscription->error;
$this->errors = $subscription->errors;
$this->setErrorsFromObject($subscription);
$this->db->rollback();
return -1;
}

17
htdocs/core/class/commonobject.class.php
View File

@ -669,6 +669,23 @@ abstract class CommonObject
}
return -1;
}
/**
* setErrorsFromObject
*
* @param CommonObject $object commonobject
* @return void
*/
public function setErrorsFromObject($object)
{
if (!empty($object->error)) {
$this->error = $object->error;
}
if (!empty($object->errors)) {
$this->errors = array_merge($this->errors, $object->errors);
}
}
/**
* getTooltipContentArray
*

2
htdocs/core/lib/functions.lib.php
View File

@ -1672,7 +1672,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
if (!array_key_exists($level, $logLevels)) {
throw new Exception('Incorrect log level');
}
if ($level > $conf->global->SYSLOG_LEVEL) {
if ($level > getDolGlobalInt('SYSLOG_LEVEL')) {
return;
}