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

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4049 a333f486-631f-4898-b8df-5754b55c2be0

application/cmdbabstract.class.inc.php

@@ -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;
 

core/attributedef.class.inc.php

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