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

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

Browse Source 
# Conflicts:
#	core/displayablegraph.class.inc.php
#	pages/UI.php
This commit is contained in:
acognet
2022-03-18 15:51:45 +01:00
parent 9d2c89f118 61137a6f65
commit 90b41e0b81
14 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/modelfactory.class.inc.php
View File

@@ -2312,7 +2312,7 @@ EOF;
*
* @param MFElement $oNewNode The replacement
*
* @since 2.7.7 3.0.1 3.1.0 N°3129 rename method (from `ReplaceWith` to `MFReplaceWith`) to avoid collision with parent `\DOMElement::replaceWith` method (different method modifier and parameters :
* @since 2.7.7 3.0.1 3.1.0 N°3129 rename method (from `ReplaceWith` to `ReplaceWithSingleNode`) to avoid collision with parent `\DOMElement::replaceWith` method (different method modifier and parameters :
* throws fatal error in PHP 8.0)
*/
protected function ReplaceWithSingleNode($oNewNode)