lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21567 from emheyarssi/15.0

Browse Source 
FIX #21518
This commit is contained in:
Laurent Destailleur 2022-07-24 20:08:11 +02:00 committed by GitHub
commit 96b7735bbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/societe/card.php
View File

@ -554,9 +554,8 @@ if (empty($reshook)) {
} }
//var_dump($object->array_languages);exit; //var_dump($object->array_languages);exit;
if (GETPOST('deletephoto')) { if (!empty($_FILES['photo']['name'])) {
$object->logo = ''; $current_logo = $object->logo;
} elseif (!empty($_FILES['photo']['name'])) {
$object->logo = dol_sanitizeFileName($_FILES['photo']['name']); $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
} }
@ -786,6 +785,13 @@ if (empty($reshook)) {
} }
if ($file_OK) { if ($file_OK) {
if (image_format_supported($_FILES['photo']['name']) > 0) { if (image_format_supported($_FILES['photo']['name']) > 0) {
if ($current_logo != $object->logo) {
$fileimg = $dir.'/'.$current_logo;
$dirthumbs = $dir.'/thumbs';
dol_delete_file($fileimg);
dol_delete_dir_recursive($dirthumbs);
}
dol_mkdir($dir); dol_mkdir($dir);
if (@is_dir($dir)) { if (@is_dir($dir)) {