FIX PROPAL_MERGE_PDF with PRODUCT_USE_OLD_PATH
This commit is contained in:
parent
d3b3e60d82
commit
4cbab1cf47
@ -247,7 +247,8 @@ if ($object->id)
|
|||||||
|
|
||||||
if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) // For backward compatiblity, we scan also old dirs
|
if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) // For backward compatiblity, we scan also old dirs
|
||||||
{
|
{
|
||||||
$filearray = dol_dir_list($upload_dirold, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1);
|
|
||||||
|
$filearray = array_merge($filearray,dol_dir_list($upload_dirold, "files", 0, '', '\.meta$', 'name', SORT_ASC, 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
// For each file build select list with PDF extention
|
// For each file build select list with PDF extention
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user