Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

Conflicts: htdocs/core/lib/functions.lib.php
Dolibarr · Dec 9, 2019 · 5dbf060 · 5dbf060
2 parents b847eb1 + 53149bb
commit 5dbf060
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
@@ -1376,6 +1376,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 					$fileimagebis = $file.'_preview-0.png';         // If PDF has more than one page
 					$relativepathimage = $relativepath.'_preview.png';
 
+
 					// Si fichier PDF existe
 					if (file_exists($file))
 					{
@@ -1387,7 +1388,8 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
 						{
 							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experienc trouble with pdf thumb generation and imagick, you can disable here.
 							{
-								$ret = dol_convert_file($file, 'png', $fileimage);
+							    include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+							    $ret = dol_convert_file($file, 'png', $fileimage);
 								if ($ret < 0) $error++;
 							}
 						}