From 94a561f0e43fe530522efafa43d383d5a8049c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Espi=C3=A9?= <eric.espie@combodo.com>
Date: Thu, 12 Oct 2017 07:43:36 +0000
Subject: [PATCH] =?UTF-8?q?N=C2=B0454=20-=20Check=20data=20validity=20duri?=
 =?UTF-8?q?ng=20CSV=20import=20*=20Cleanup=20expression=20construction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SVN:trunk[5006]
---
 core/valuesetdef.class.inc.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/valuesetdef.class.inc.php b/core/valuesetdef.class.inc.php
index e9846f77d..41a88dd78 100644
--- a/core/valuesetdef.class.inc.php
+++ b/core/valuesetdef.class.inc.php
@@ -202,10 +202,13 @@ class ValueSetObjects extends ValueSetDefinition
 			}
 		}
 
-		$oValueExpr = new ScalarExpression('%'.$sContains.'%');
-		$oNameExpr = new FieldExpression('friendlyname', $oFilter->GetClassAlias());
-		$oNewCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
-		$oFilter->AddConditionExpression($oNewCondition);
+		if (!empty($sContains))
+		{
+			$oValueExpr = new ScalarExpression('%'.$sContains.'%');
+			$oNameExpr = new FieldExpression('friendlyname', $oFilter->GetClassAlias());
+			$oNewCondition = new BinaryExpression($oNameExpr, 'LIKE', $oValueExpr);
+			$oFilter->AddConditionExpression($oNewCondition);
+		}
 
 		$oObjects = new DBObjectSet($oFilter, $this->m_aOrderBy, $aArgs);
 		while ($oObject = $oObjects->Fetch())