From 0918a063bbd7e29688b4f41dcb1928c09df1f61e Mon Sep 17 00:00:00 2001
From: mMarinetti <michael.marinetti@prestashop.com>
Date: Thu, 22 Dec 2011 19:21:52 +0000
Subject: [PATCH] // fixed #PSTEST-142

---
 classes/AdminController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/AdminController.php b/classes/AdminController.php
index 1c967488a..9861ce636 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -230,7 +230,7 @@ class AdminControllerCore extends Controller
 	protected $_redirect = true;
 
 	/** @var array Name and directory where class image are located */
-	public $fieldImageSettings = null;
+	public $fieldImageSettings = array();
 
 	/** @var string Image type */
 	public $imageType = 'jpg';
@@ -544,7 +544,7 @@ class AdminControllerCore extends Controller
 			{
 				if ($this->deleted)
 				{
-					if (isset($this->fieldImageSettings))
+					if (!empty($this->fieldImageSettings))
 						$res = $object->deleteImage();
 					
 					if (!$res)
@@ -2310,6 +2310,7 @@ class AdminControllerCore extends Controller
 				foreach ($row as $id_shop => $value)
 					$assos[] = array('id_object' => (int)$id_asso_object, 'id_'.$type => (int)$id_shop);
 			}
+
 		return array($assos, $type);
 	}