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/3.2' into develop

Browse Source
This commit is contained in:
bdalsass
2025-07-07 14:04:18 +02:00
parent a2d6423f32 c8371f1c19
commit a7877dc6a6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1827,7 +1827,7 @@ EOF;
// Search field in parent class
$oField = $this->GetFieldInParentClasses($oClass, $sStateAttCode);
if ($oField == null) {
throw new DOMFormatException("Non existing attribute '$sStateAttCode'", null, null, $oStateAttribute);
throw new DOMFormatException("Non existing attribute '$sStateAttCode'", 0, null, $oStateAttribute);
}
}
$oCodeNodes = $this->oFactory->GetNodes('values/value/code', $oField);

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

@@ -2040,7 +2040,7 @@ class MFElement extends Combodo\iTop\DesignElement
{
// Houston!
$sXPath = DesignDocument::GetItopNodePath($this);
throw new DOMFormatException("id '$key' already used in $sXPath", null, null, $oItem);
throw new DOMFormatException("id '$key' already used in $sXPath", 0, null, $oItem);
}
$res[$key] = $oItem->GetNodeAsArrayOfItems();
}