From 1bee84d26cd8daa43e06806f9679dde2e831d035 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Tue, 29 Oct 2013 10:57:33 +0100 Subject: [PATCH] [-] BO : Do not delete other default jpg when _deleteOldImages and type defined --- controllers/admin/AdminImagesController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 922fcf050..9a1e2dd9a 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -438,10 +438,11 @@ class AdminImagesControllerCore extends AdminController if (!is_dir($dir)) return false; $toDel = scandir($dir); + foreach ($toDel as $d) foreach ($type as $imageType) - if (preg_match('/^[0-9]+\-'.($product ? '[0-9]+\-' : '').$imageType['name'].'\.jpg$/', $d) || preg_match('/^([[:lower:]]{2})\-default\-(.*)\.jpg$/', $d)) - if (file_exists($dir.$d)) + if (preg_match('/^[0-9]+\-'.($product ? '[0-9]+\-' : '').$imageType['name'].'\.jpg$/', $d) || preg_match('/^([[:lower:]]{2})\-default\-'.$imageType['name'].'\.jpg$/', $d)) + if (file_exists($dir.$d)) unlink($dir.$d); // delete product images using new filesystem.