From b8184785d1abe74eae21d692d0a18d4d925b7848 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Wed, 18 Jul 2012 14:29:09 +0000 Subject: [PATCH] [-] BO : fix #PSCFV-3243 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16474 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminImportController.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 7a7670c05..486675a9d 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -1443,11 +1443,6 @@ class AdminImportControllerCore extends AdminController $product->deleteImages(); $this->cache_image_deleted[(int)$product->id] = true; } - else if (array_key_exists('image_url', $info) && !isset($this->cache_image_deleted[(int)$product->id])) - { - $product->deleteImages(); - $this->cache_image_deleted[(int)$product->id] = true; - } if (isset($info['image_url']) && $info['image_url']) { @@ -1466,7 +1461,10 @@ class AdminImportControllerCore extends AdminController { $image->associateTo($id_shop_list); if (!AdminImportController::copyImg($product->id, $image->id, $url)) - $this->warnings[] = Tools::displayError('Error copying image:').$url; + { + $this->warnings[] = sprintf(Tools::displayError('Error copying image: %s'), $url); + $image->delete(); + } else $id_image = array($image->id); }