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/develop' into feature/backoffice-full-moon-design

Browse Source 
# Conflicts:
#	core/metamodel.class.php
This commit is contained in:
Pierre Goiffon
2020-10-19 15:44:19 +02:00
parent e7360661be be9a428529
commit 5d1de543cc
11 changed files with 616 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/csvimport.php
View File

@@ -452,7 +452,7 @@ try
// Do nothing
}
}
$sHtmlValue = utils::HtmlEntities(utils::HtmlEntityDecode($oCellStatus->GetDisplayableValue()));
$sHtmlValue = $oCellStatus->GetDisplayableValue();
switch(get_class($oCellStatus))
{
case 'CellStatus_Issue':