From a8f53294a94b51dd462fdf67cbc0db441f948760 Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Mon, 30 Jan 2012 17:41:01 +0000
Subject: [PATCH] Protect against empty list of reconciliation keys

SVN:trunk[1819]
---
 pages/ajax.csvimport.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pages/ajax.csvimport.php b/pages/ajax.csvimport.php
index 138d3ffb52..e1836f498b 100644
--- a/pages/ajax.csvimport.php
+++ b/pages/ajax.csvimport.php
@@ -347,6 +347,7 @@ try
 			$aMoreReconciliationKeys = array(); // Store: key => void to automatically remove duplicates
 			foreach($aReconciliationKeys as $sAttCode)
 			{
+				if (!MetaModel::IsValidAttCode($sClassName, $sAttCode)) continue;
 				$oAttDef = MetaModel::GetAttributeDef($sClassName, $sAttCode);
 				if ($oAttDef->IsExternalKey())
 				{
@@ -403,7 +404,7 @@ EOF
 		}
 		else
 		{
-			$oPage = new ajax_page("");
+			$oPage = new ajax_page("Class $sClassName is not a valid class !");
 		}
 		break;
 	}