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

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

Browse Source 
# Conflicts:
#	application/datamodel.application.xml
This commit is contained in:
Pierre Goiffon
2020-10-07 18:37:06 +02:00
parent 51669d0479 06acac97ba
commit bb53aef09f
3 changed files with 12 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/dbobject.class.php
View File

@@ -3699,16 +3699,14 @@ abstract class DBObject implements iDisplay
// save current object values in case of an action failure (in memory rollback)
$aBackupValues = array();
foreach(MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
{
$value = $this->m_aCurrValues[$sAttCode];
if (is_object($value))
{
$aBackupValues[$sAttCode] = clone $value;
}
else
{
$aBackupValues[$sAttCode] = $value;
foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef) {
if (isset($this->m_aCurrValues[$sAttCode])) {
$value = $this->m_aCurrValues[$sAttCode];
if (is_object($value)) {
$aBackupValues[$sAttCode] = clone $value;
} else {
$aBackupValues[$sAttCode] = $value;
}
}
}