From 8b7005fbb387fad120c6c7144cdea5e9989fa5f7 Mon Sep 17 00:00:00 2001 From: Anne-Cath Date: Mon, 31 Mar 2025 11:16:42 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B08291=20-=20CSV=20import=20-=20column=20n?= =?UTF-8?q?ame=20not=20automatically=20recognized=20in=20import=20when=20n?= =?UTF-8?q?ame=20ending=20by=20a=20space?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/ajax.csvimport.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/ajax.csvimport.php b/pages/ajax.csvimport.php index adb0d449e..9d725e814 100644 --- a/pages/ajax.csvimport.php +++ b/pages/ajax.csvimport.php @@ -147,7 +147,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] = MetaModel::GetLabel($sClassName, $sAttCode.'->'.$sTargetAttCode, true); foreach ($aSignatures as $sSignature) { - if (strcasecmp($sFieldName, $sSignature) == 0) { + if (strcasecmp(trim($sFieldName), trim($sSignature)) == 0) { $sFieldCode = $sAttCode.'->'.$sTargetAttCode; } } @@ -160,7 +160,7 @@ function GetMappingForField($sClassName, $sFieldName, $iFieldIndex, $bAdvancedMo || ($oAttDef instanceof AttributeFriendlyName) ) { $aChoices[$sAttCode] = MetaModel::GetLabel($sClassName, $sAttCode, true); - if (($sFieldName == $oAttDef->GetLabel()) || ($sFieldName == $sAttCode)) { + if (strcasecmp(trim($sFieldName), trim($oAttDef->GetLabel())) == 0 || (trim($sFieldName) == $sAttCode)) { $sFieldCode = $sAttCode; } }