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

# Conflicts:
#	core/designdocument.class.inc.php
#	lib/composer/autoload_files.php
#	lib/composer/autoload_static.php
This commit is contained in:
Eric Espie
2024-03-19 14:06:24 +01:00
16 changed files with 3223 additions and 1187 deletions

View File

@@ -901,7 +901,9 @@ class iTopDesignFormat
// 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);
if ($oNode->firstChild) {
$oNode->removeChild($oNode->firstChild);
}
$oCodeNode = $oNode->ownerDocument->createElement("code", $sCode);
$oNode->appendChild($oCodeNode);
}

File diff suppressed because it is too large Load Diff