Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts: htdocs/core/lib/functions.lib.php
This commit is contained in:
commit
f2c7d3de2e
@ -1425,6 +1425,7 @@ function dol_banner_tab($object, $paramid, $morehtml='', $shownav=1, $fieldid='r
|
|||||||
$fileimagebis = $file.'_preview-0.png'; // If PDF has more than one page
|
$fileimagebis = $file.'_preview-0.png'; // If PDF has more than one page
|
||||||
$relativepathimage = $relativepath.'_preview.png';
|
$relativepathimage = $relativepath.'_preview.png';
|
||||||
|
|
||||||
|
|
||||||
// Si fichier PDF existe
|
// Si fichier PDF existe
|
||||||
if (file_exists($file))
|
if (file_exists($file))
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user