mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2026-01-06 17:13:03 +01:00
Merge branch '21.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
@@ -9865,7 +9865,7 @@ abstract class CommonObject
|
||||
$filearray=array_merge($filearray, $filearrayold);
|
||||
}*/
|
||||
|
||||
completeFileArrayWithDatabaseInfo($filearray, $relativedir);
|
||||
completeFileArrayWithDatabaseInfo($filearray, $relativedir, $this);
|
||||
'@phan-var-force array<array{name:string,path:string,level1name:string,relativename:string,fullname:string,date:string,size:int,perm:int,type:string,position_name:string,cover:string,keywords:string,acl:string,rowid:int,label:string,share:string}> $filearray';
|
||||
|
||||
if (count($filearray)) {
|
||||
|
||||
Reference in New Issue
Block a user