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

Fix application being wrongly set to Archive Mode when it fails to retrieve an object from the database.

Browse Source 
SVN:trunk[5340]
This commit is contained in:
Guillaume Lajarige
2018-02-12 12:28:10 +00:00
parent 5b378ee9dd
commit 3af724a941
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/metamodel.class.php
View File

@@ -6225,7 +6225,17 @@ abstract class MetaModel
self::_check_subclass($sClass);
utils::PushArchiveMode(true);
$aRow = self::MakeSingleRow($sClass, $iKey, $bMustBeFound, $bAllowAllData, $aModifierProperties);
try
{
$aRow = self::MakeSingleRow($sClass, $iKey, $bMustBeFound, $bAllowAllData, $aModifierProperties);
}
catch(Exception $e)
{
// We need to pop the pushed archived mode before the exception is thrown, otherwise the application stays in ArchiveMode true which has caused hazardious behavior!
// Note: When switching to PHP 5.6, we can use a finally block instead of duplicating this line.
utils::PopArchiveMode();
throw $e;
}
utils::PopArchiveMode();
if (empty($aRow))