Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0

Browse Source
This commit is contained in:
Laurent Destailleur
2024-05-31 16:30:50 +02:00
parent 65cfd9fa13 382f279783
commit 5ee4af14ed
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/api/class/api_documents.class.php
View File

@@ -596,8 +596,10 @@ class Documents extends DolibarrApi
} elseif (is_array($ecmfile->lines) && count($ecmfile->lines) > 0) {
$count = count($filearray);
for ($i = 0 ; $i < $count ; $i++) {
if ($filearray[$i]['name'] == $ecmfile->lines[$i]->filename) {
$filearray[$i] = array_merge($filearray[$i], (array) $ecmfile->lines[0]);
foreach ($ecmfile->lines as $line) {
if ($filearray[$i]['name'] == $line->filename) {
$filearray[$i] = array_merge($filearray[$i], (array) $line);
}
}
}
}