From 866175603e0225d05d55662471219a9bb3bbdcb7 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Mon, 1 Oct 2012 08:41:44 +0000 Subject: [PATCH] [-] BO : fix #PSCFV-4216 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17631 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminImportController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 38487b254..bba5c5cde 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -298,6 +298,7 @@ class AdminImportControllerCore extends AdminController 'address1', 'postcode', 'country', + 'customer_email', 'city' ); @@ -2055,7 +2056,7 @@ class AdminImportControllerCore extends AdminController $info['alias'], (isset($info['id']) ? $info['id'] : 'null') ); - $this->errors[] = ($field_error !== true ? $field_error : '').($lang_field_error !== true ? $lang_field_error : ''). + $this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : ''). Db::getInstance()->getMsgError(); } }