Merge remote-tracking branch 'origin/support/3.0' into support/3.1

This commit is contained in:
Pierre Goiffon
2023-08-01 14:27:41 +02:00

View File

@@ -892,7 +892,10 @@ class iTopDesignFormat
$oNodeList = $oXPath->query("/itop_design/classes//class/fields/field/values/value"); $oNodeList = $oXPath->query("/itop_design/classes//class/fields/field/values/value");
foreach ($oNodeList as $oNode) { foreach ($oNodeList as $oNode) {
$sCode = $oNode->textContent; $sCode = $oNode->textContent;
$oNode->textContent = ''; // N°6562 textContent is readonly, see https://www.php.net/manual/en/class.domnode.php#95545
// $oNode->textContent = '';
// N°6562 to update text node content we must use the node methods !
$oNode->removeChild($oNode->firstChild);
$oCodeNode = $oNode->ownerDocument->createElement("code", $sCode); $oCodeNode = $oNode->ownerDocument->createElement("code", $sCode);
$oNode->appendChild($oCodeNode); $oNode->appendChild($oCodeNode);
} }
@@ -982,7 +985,12 @@ class iTopDesignFormat
if ($oStyleNode) { if ($oStyleNode) {
$this->DeleteNode($oStyleNode); $this->DeleteNode($oStyleNode);
} }
$oNode->textContent = $sCode;
// N°6562 textContent is readonly, see https://www.php.net/manual/en/class.domnode.php#95545
// $oNode->textContent = $sCode;
// N°6562 to update text node content we must use the node methods !
$oTextContentNode = new DOMText($sCode);
$oNode->appendChild($oTextContentNode);
} }
} }
// - Style // - Style