composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.7' into develop

Browse Source 
# Conflicts:
#	application/displayblock.class.inc.php
#	js/search/search_form_criteria_enum.js
#	test/core/ormLinkSetTest.php
This commit is contained in:
Stephen Abello
2021-12-02 10:04:04 +01:00
parent 2722f305e0 dfd1d5fe35
commit 18e341b0b7
4 changed files with 102 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/spreadsheetbulkexport.class.inc.php
View File

@@ -354,7 +354,7 @@ EOF
}
else if ($oAttDef instanceof AttributeTagSet)
{
$sField = $oObj->GetAsCSV($sAttCode, $this->bLocalizeOutput, '');
$sField = utils::HtmlEntities($oObj->GetAsCSV($sAttCode, $this->bLocalizeOutput, ''));
$sData .= "<td x:str>$sField</td>";
}
else