From 05a2443afe3dda0dda8dd25a5b0af91ec577ebc5 Mon Sep 17 00:00:00 2001 From: Denis Flaven Date: Mon, 25 Oct 2010 17:05:12 +0000 Subject: [PATCH] The previous fix for Trac #276 broke the auto mapping of external keys... now fixed. SVN:trunk[929] --- pages/ajax.csvimport.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/ajax.csvimport.php b/pages/ajax.csvimport.php index b5d78e38b..3b73df21d 100644 --- a/pages/ajax.csvimport.php +++ b/pages/ajax.csvimport.php @@ -154,7 +154,7 @@ function GetMappingForField($sClassName, $sFieldName, $iFieldIndex, $bAdvancedMo // When not in advanced mode do not allow to use reconciliation keys (on external keys) if they are themselves external keys ! $aChoices[$sAttCode.'->'.$sTargetAttCode] = $oAttDef->GetLabel().'->'.$oTargetAttDef->GetLabel().$sSuffix.$sStar; - if ((strcasecmp($sFieldName, $aChoices[$sAttCode.'->'.$sTargetAttCode]) == 0) || (strcasecmp($sFieldName, ($sAttCode.'->'.$sTargetAttCode.$sSuffix)) == 0) ) + if ((strcasecmp($sFieldName, $oAttDef->GetLabel().'->'.$oTargetAttDef->GetLabel().$sSuffix) == 0) || (strcasecmp($sFieldName, ($sAttCode.'->'.$sTargetAttCode.$sSuffix)) == 0) ) { $sFieldCode = $sAttCode.'->'.$sTargetAttCode; }