From 0ecfffe413a38cc8cf97eeebeb3b27d11dce6d2c Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Thu, 13 Feb 2020 12:12:35 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B02746=20-=20Fix=20export=20separator?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/attributedef.class.inc.php    | 8 +++++---
 core/excelbulkexport.class.inc.php | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 5d5eefcaa..b2a2953b2 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -10104,6 +10104,7 @@ abstract class AttributeSet extends AttributeDBFieldVoid
 	 */
 	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
 	{
+		$sSepItem = MetaModel::GetConfig()->Get('tag_set_item_separator');
 		if (is_object($value) && ($value instanceof ormSet))
 		{
 			if ($bLocalize)
@@ -10114,7 +10115,7 @@ abstract class AttributeSet extends AttributeDBFieldVoid
 			{
 				$aValues = $value->GetValues();
 			}
-			$sRes = implode($sSeparator, $aValues);
+			$sRes = implode($sSepItem, $aValues);
 		}
 		else
 		{
@@ -10283,6 +10284,7 @@ class AttributeEnumSet extends AttributeSet
 	 */
 	public function GetAsCSV($value, $sSeparator = ',', $sTextQualifier = '"', $oHostObject = null, $bLocalize = true, $bConvertToPlainText = false)
 	{
+		$sSepItem = MetaModel::GetConfig()->Get('tag_set_item_separator');
 		if (is_object($value) && ($value instanceof ormSet))
 		{
 			$aValues = $value->GetValues();
@@ -10291,11 +10293,11 @@ class AttributeEnumSet extends AttributeSet
 				$aLocalizedValues = array();
 				foreach($aValues as $sValue)
 				{
-					$aLocalizedValues[] = utils::HtmlEntities($this->GetValueLabel($sValue));
+					$aLocalizedValues[] = $this->GetValueLabel($sValue);
 				}
 				$aValues = $aLocalizedValues;
 			}
-			$sRes = implode($sSeparator, $aValues);
+			$sRes = implode($sSepItem, $aValues);
 		}
 		else
 		{
diff --git a/core/excelbulkexport.class.inc.php b/core/excelbulkexport.class.inc.php
index 0a93193b4..f19de3f0a 100644
--- a/core/excelbulkexport.class.inc.php
+++ b/core/excelbulkexport.class.inc.php
@@ -193,7 +193,7 @@ EOF
                 $oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
                 $sRet = $oAttDef->GetAsCSV($value, '', '', $oObj);
             }
-            else if ($value instanceOf ormTagSet)
+            else if ($value instanceOf ormSet)
             {
                 $oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode);
                 $sRet = $oAttDef->GetAsCSV($value, '', '', $oObj);
@@ -386,4 +386,4 @@ EOF
 	{
 		return array('xlsx' => Dict::S('Core:BulkExport:XLSXFormat'));
 	}
-}
\ No newline at end of file
+}