From d4eaf43257d11597d7217dfd3ecca505f2fb8ba7 Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Wed, 1 Dec 2010 16:27:11 +0000
Subject: [PATCH] Fixed cosmetic issues in the CSV import (related to the
 recent changes)

SVN:trunk[1005]
---
 core/bulkchange.class.inc.php | 4 ++--
 pages/csvimport.php           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/bulkchange.class.inc.php b/core/bulkchange.class.inc.php
index af1564bd8..d25e1aac7 100644
--- a/core/bulkchange.class.inc.php
+++ b/core/bulkchange.class.inc.php
@@ -516,7 +516,7 @@ class BulkChange
 		{
 			$sErrors = implode(', ', $aErrors);
 			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue("Unexpected attribute value(s)");
-			return;
+			return $oTargetObj;
 		}
 	
 		// Check that any external key will have a value proposed
@@ -535,7 +535,7 @@ class BulkChange
 		{
 			$sMissingKeys = implode(', ', $aMissingKeys);
 			$aResult[$iRow]["__STATUS__"] = new RowStatus_Issue("Could not be created, due to missing external key(s): $sMissingKeys");
-			return;
+			return $oTargetObj;
 		}
 	
 		// Optionaly record the results
diff --git a/pages/csvimport.php b/pages/csvimport.php
index d2ff49f00..6b9aef28d 100644
--- a/pages/csvimport.php
+++ b/pages/csvimport.php
@@ -596,13 +596,13 @@ try
 				$fErrorsPercentage = (100.0*$iErrors)/count($aRes);
 				if ($fErrorsPercentage >= utils::GetConfig()->Get('csv_import_errors_percentage'))
 				{
-					$sMessage = sprintf("%.0f %% of the loaded objects will be modified.", $fErrorsPercentage);
+					$sMessage = sprintf("%.0f %% of the loaded objects have errors and will be ignored.", $fErrorsPercentage);
 					$bShouldConfirm = true;
 				}
 				$fCreatedPercentage = (100.0*$iCreated)/count($aRes);
 				if ($fCreatedPercentage >= utils::GetConfig()->Get('csv_import_creations_percentage'))
 				{
-					$sMessage = sprintf("%.0f %% of the loaded objects will be modified.", $fCreatedPercentage);
+					$sMessage = sprintf("%.0f %% of the loaded objects will be created.", $fCreatedPercentage);
 					$bShouldConfirm = true;
 				}
 				$fModifiedPercentage = (100.0*$iModified)/count($aRes);