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

Fix for editing HTML content containing html entities: & must be encoded as & as well !!

Browse Source 
SVN:trunk[4049]
This commit is contained in:
Denis Flaven
2016-05-10 19:26:02 +00:00
parent 1d3ab23699
commit ccddf1d4f0
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/cmdbabstract.class.inc.php
View File

@@ -1815,7 +1815,8 @@ EOF
break;
case 'HTML':
$oWidget = new UIHTMLEditorWidget($iId, $oAttDef, $sNameSuffix, $sFieldPrefix, $sHelpText, $sValidationSpan.$sReloadSpan, $value, $bMandatory);
$sEditValue = $oAttDef->GetEditValue($value);
$oWidget = new UIHTMLEditorWidget($iId, $oAttDef, $sNameSuffix, $sFieldPrefix, $sHelpText, $sValidationSpan.$sReloadSpan, $sEditValue, $bMandatory);
$sHTMLValue = $oWidget->Display($oPage, $aArgs);
break;

4
core/attributedef.class.inc.php
View File

@@ -2470,6 +2470,10 @@ class AttributeText extends AttributeString
}
}
}
else
{
$sValue = str_replace('&', '&', $sValue);
}
return $sValue;
}