Merge pull request #23511 from noec764/FIX_Ecmfile_Ref

FIX: ref not available after ecmFiles::create()
This commit is contained in:
Laurent Destailleur 2023-01-11 19:08:39 +01:00 committed by GitHub
commit 74501fb20e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -240,12 +240,9 @@ class EcmFiles extends CommonObject
} }
// If ref not defined // If ref not defined
$ref = ''; if (empty($this->ref)) {
if (!empty($this->ref)) {
$ref = $this->ref;
} else {
include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/security.lib.php';
$ref = dol_hash($this->filepath.'/'.$this->filename, 3); $this->ref = dol_hash($this->filepath.'/'.$this->filename, 3);
} }
$maxposition = 0; $maxposition = 0;
@ -300,7 +297,7 @@ class EcmFiles extends CommonObject
$sql .= 'src_object_type,'; $sql .= 'src_object_type,';
$sql .= 'src_object_id'; $sql .= 'src_object_id';
$sql .= ') VALUES ('; $sql .= ') VALUES (';
$sql .= " '".$this->db->escape($ref)."', "; $sql .= " '".$this->db->escape($this->ref)."', ";
$sql .= ' '.(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").','; $sql .= ' '.(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").',';
$sql .= ' '.(!isset($this->share) ? 'NULL' : "'".$this->db->escape($this->share)."'").','; $sql .= ' '.(!isset($this->share) ? 'NULL' : "'".$this->db->escape($this->share)."'").',';
$sql .= ' '.$this->entity.','; $sql .= ' '.$this->entity.',';