FIX PROPAL_MERGE_PDF with PRODUCT_USE_OLD_PATH

Dolibarr · May 12, 2016 · 4cbab1c · 4cbab1c
1 parent d3b3e60
commit 4cbab1c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/htdocs/product/document.php b/htdocs/product/document.php
@@ -247,7 +247,8 @@
 
     	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