From c1a4f91af6fc055e953b8458fa2f52bcbeb8bee6 Mon Sep 17 00:00:00 2001
From: lLefevre <loic.lefevre@prestashop.com>
Date: Tue, 16 Oct 2012 13:14:14 +0000
Subject: [PATCH] [-] BO : fix #PSCFV-5008

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17876 b9a71923-0436-4b27-9f14-aed3839534dd
---
 controllers/admin/AdminImportController.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php
index b06678cf9..a5a7f6e3d 100644
--- a/controllers/admin/AdminImportController.php
+++ b/controllers/admin/AdminImportController.php
@@ -762,7 +762,8 @@ class AdminImportControllerCore extends AdminController
 					$entity->{$key}[$id_lang_tmp] = $value;
 		}
 		else
-			$entity->{$key} = isset(self::$validators[$key]) ? call_user_func(self::$validators[$key], $infos) : $infos;
+			if (!empty($infos))
+				$entity->{$key} = isset(self::$validators[$key]) ? call_user_func(self::$validators[$key], $infos) : $infos;
 
 		return true;
 	}
@@ -2772,8 +2773,8 @@ class AdminImportControllerCore extends AdminController
 	{
 		if ($this->tabAccess['edit'] === '1')
 		{
-		   Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'import_match` WHERE `id_import_match` = '.(int)Tools::getValue('idImportMatchs'));
-		   die;
+			Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'import_match` WHERE `id_import_match` = '.(int)Tools::getValue('idImportMatchs'));
+			die;
 		}
 	}
 }