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

Merge remote-tracking branch 'origin/releases/germanium' into develop

Browse Source 
# Conflicts:
#	setup/modelfactory.class.inc.php
This commit is contained in:
Pierre Goiffon
2020-04-06 08:47:22 +02:00
parent bcd21aefb4 4688c92e7c
commit 0360a3160d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2019,14 +2019,14 @@ class MFElement extends Combodo\iTop\DesignElement
* Find the child node matching the given node under the specified parent.
* UNSAFE: may return nodes marked as _alteration="removed"
*
* @param \DOMNode $oParent
* @param \MFElement $oParent
* @param \MFElement $oRefNode
* @param string $sSearchId
*
* @return \MFElement|null
* @throws Exception
*/
public static function _FindNode(DOMNode $oParent, MFElement $oRefNode, $sSearchId = null)
public static function _FindNode(MFElement $oParent, MFElement $oRefNode, $sSearchId = null)
{
$oRes = null;
if ($oParent instanceof DOMDocument)