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

Merge remote-tracking branch 'origin/datatable' into feature/backoffice-full-moon-design

Browse Source
This commit is contained in:
Eric
2020-11-16 15:24:07 +01:00
parent 48bf954387 4c78ecab91
commit 103b5bfd22
101 changed files with 3838 additions and 1521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/dbobject.class.php
View File

@@ -3599,7 +3599,7 @@ abstract class DBObject implements iDisplay
// As a temporary fix: delete only the objects that are still to be deleted...
if ($oToDelete->m_bIsInDB)
{
set_time_limit($iLoopTimeLimit);
set_time_limit(intval($iLoopTimeLimit));
$oToDelete->DBDeleteSingleObject();
}
}
@@ -3614,13 +3614,13 @@ abstract class DBObject implements iDisplay
foreach ($aData['attributes'] as $sRemoteExtKey => $aRemoteAttDef)
{
$oToUpdate->Set($sRemoteExtKey, $aData['values'][$sRemoteExtKey]);
set_time_limit($iLoopTimeLimit);
set_time_limit(intval($iLoopTimeLimit));
$oToUpdate->DBUpdate();
}
}
}
set_time_limit($iPreviousTimeLimit);
set_time_limit(intval($iPreviousTimeLimit));
return $oDeletionPlan;
}
@@ -4565,7 +4565,7 @@ abstract class DBObject implements iDisplay
{
foreach ($aPotentialDeletes as $sRemoteExtKey => $aData)
{
set_time_limit($iLoopTimeLimit);
set_time_limit(intval($iLoopTimeLimit));
/** @var \AttributeExternalKey $oAttDef */
$oAttDef = $aData['attribute'];
@@ -4597,7 +4597,7 @@ abstract class DBObject implements iDisplay
}
}
}
set_time_limit($iPreviousTimeLimit);
set_time_limit(intval($iPreviousTimeLimit));
}
/**