diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 1226d3b35ba..8c704aba52d 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -859,11 +859,15 @@ class FormFile
{
$fileinfo = pathinfo($file['name']);
print '';
- $minifile=$fileinfo['filename'].'_mini.'.strtolower($fileinfo['extension']); // Thumbs are created with filename in lower case
if (image_format_supported($file['name']) > 0)
{
- print '';
- print '.') ';
+ $minifile=getImageFileNameForSize($file['name'], '_mini', '.png'); // Thumbs are created with filename in lower case and with .png extension
+ //print $relativepath.'
';
+ //print $file['path'].'/'.$minifile.'
';
+ if (! dol_is_file($file['path'].'/'.$minifile)) $minifile=getImageFileNameForSize($file['name'], '_mini', '.'.$fileinfo['extension']); // For old thumbs
+ //print $file['path'].'/'.$minifile.'
';
+ print '';
+ print '.') ';
print '';
}
else print ' ';
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index a1bdf274995..4b1d3f3e491 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1451,6 +1451,12 @@ function dol_add_file_process($upload_dir, $allowoverwrite=0, $donotupdatesessio
$destfile=preg_replace('/__file__/',$_FILES[$varfiles]['name'],$savingdocmask);
}
+ // lowercase extension
+ $info = pathinfo($destpath);
+ $destpath = $info['dirname'].'/'.$info['filename'].'.'.strtolower($info['extension']);
+ $info = pathinfo($destfile);
+ $destfile = $info['filename'].'.'.strtolower($info['extension']);
+
$resupload = dol_move_uploaded_file($_FILES[$varfiles]['tmp_name'], $destpath, $allowoverwrite, 0, $_FILES[$varfiles]['error'], 0, $varfiles);
if (is_numeric($resupload) && $resupload > 0)
{
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 2fe9065b21c..669da7b751b 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -473,6 +473,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
}
// Initialisation des variables selon l'extension de l'image
+ // $targetformat is 0 by default, in such case, we keep original extension
switch($targetformat)
{
case IMAGETYPE_GIF: // 1
|