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

FIX after PR feedback: remove uses of keyword attribute of EcmFiles (use keywords instead)

Browse Source
This commit is contained in:
Florian Mortgat 2021-06-30 09:34:49 +02:00
parent d0a4ae88b1
commit 94416072d8
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/files.lib.php
View File

@ -1785,13 +1785,13 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
$ecmfile->fullpath_orig = $fullpathorig;
$ecmfile->gen_or_uploaded = $mode;
$ecmfile->description = ''; // indexed content
$ecmfile->keyword = ''; // keyword content
$ecmfile->keywords = ''; // keyword content
if (is_object($object) && $object->id > 0) {
$ecmfile->src_object_id = $object->id;
if (isset($object->table_element)) $ecmfile->src_object_type = $object->table_element;
if (isset($object->src_object_description)) $ecmfile->description = $object->src_object_description;
if (isset($object->src_object_keyword)) $ecmfile->keyword = $object->src_object_keyword;
if (isset($object->src_object_keywords)) $ecmfile->keywords = $object->src_object_keywords;
}
if ($setsharekey) {

2
htdocs/ecm/class/ecmfiles.class.php
View File

@ -288,7 +288,6 @@ class EcmFiles extends CommonObject
$sql .= 'fullpath_orig,';
$sql .= 'description,';
$sql .= 'keywords,';
$sql .= 'keyword,';
$sql .= 'cover,';
$sql .= 'position,';
$sql .= 'gen_or_uploaded,';
@ -310,7 +309,6 @@ class EcmFiles extends CommonObject
$sql .= ' '.(!isset($this->fullpath_orig) ? 'NULL' : "'".$this->db->escape($this->fullpath_orig)."'").',';
$sql .= ' '.(!isset($this->description) ? 'NULL' : "'".$this->db->escape($this->description)."'").',';
$sql .= ' '.(!isset($this->keywords) ? 'NULL' : "'".$this->db->escape($this->keywords)."'").',';
$sql .= ' '.(!isset($this->keyword) ? 'NULL' : "'".$this->db->escape($this->keyword)."'").',';
$sql .= ' '.(!isset($this->cover) ? 'NULL' : "'".$this->db->escape($this->cover)."'").',';
$sql .= ' '.$maxposition.',';
$sql .= ' '.(!isset($this->gen_or_uploaded) ? 'NULL' : "'".$this->db->escape($this->gen_or_uploaded)."'").',';