From a2b4b71bc9fadec79e26274cbc0d0e2c50a00cbe Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Sat, 19 May 2012 10:47:09 +0000
Subject: [PATCH] // Fix tmp image deletion for carriers #PSCFV-2435

---
 classes/Carrier.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/classes/Carrier.php b/classes/Carrier.php
index 8c8bf69ae..dd477fd33 100644
--- a/classes/Carrier.php
+++ b/classes/Carrier.php
@@ -783,10 +783,13 @@ class CarrierCore extends ObjectModel
 			copy($old_logo, _PS_SHIP_IMG_DIR_.'/'.(int)$this->id.'.jpg');
 
 		$old_tmp_logo = _PS_TMP_IMG_DIR_.'/carrier_mini_'.(int)$old_id.'.jpg';
-		if (file_exists($old_tmp_logo) && !isset($_FILES['logo']))
-			copy($old_tmp_logo, _PS_TMP_IMG_DIR_.'/carrier_mini_'.$this->id.'.jpg');
-		unlink($old_tmp_logo);
-		
+		if (file_exists($old_tmp_logo))
+		{
+			if (!isset($_FILES['logo']))
+				copy($old_tmp_logo, _PS_TMP_IMG_DIR_.'/carrier_mini_'.$this->id.'.jpg');
+			unlink($old_tmp_logo);
+		}
+
 		// Copy existing ranges price
 		foreach (array('range_price', 'range_weight') as $range)
 		{