Merge branch '22.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
68544e9bf7
2 changed files with 3 additions and 3 deletions
|
|
@ -81,7 +81,7 @@ abstract class CommonInvoice extends CommonObject
|
|||
public $date_lim_reglement;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
* @var ?int
|
||||
*/
|
||||
public $cond_reglement_id; // Id in llx_c_paiement
|
||||
/**
|
||||
|
|
@ -98,7 +98,7 @@ abstract class CommonInvoice extends CommonObject
|
|||
public $cond_reglement_doc;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
* @var ?int
|
||||
*/
|
||||
public $mode_reglement_id;
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
|
|||
$array_param = null;
|
||||
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PATCH'); // RFC 5789
|
||||
if (!is_array($param)) {
|
||||
parse_str($param, $array_param);
|
||||
parse_str($param, $array_param); // @phan-suppress-current-line PhanPluginConstantVariableNull
|
||||
} else {
|
||||
dol_syslog("parameter param must be a string", LOG_WARNING);
|
||||
$array_param = $param;
|
||||
|
|
|
|||
Loading…
Reference in a new issue