Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0

Browse Source 
Conflicts:
	htdocs/product/stock/replenishorders.php
This commit is contained in:
Laurent Destailleur
2019-10-29 11:43:35 +01:00
parent 40135e043e 21d15c3bcb
commit e58ecaaa64
3 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/core/lib/files.lib.php
View File

@@ -1843,10 +1843,15 @@ function dol_convert_file($fileinput, $ext='png', $fileoutput='')
if (empty($fileoutput)) $fileoutput=$fileinput.".".$ext;
$count = $image->getNumberImages();
if (! dol_is_file($fileoutput) || is_writeable($fileoutput))
{
$ret = $image->writeImages($fileoutput, true);
try {
$ret = $image->writeImages($fileoutput, true);
}
catch(Exception $e)
{
dol_syslog($e->getMessage(), LOG_WARNING);
}
}
else
{