composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-17 22:39:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Molkobain
2023-10-13 10:13:25 +02:00
parent 593131a7ea 819baa3951
commit 9b970a472f
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/Application/TwigBase/Controller/Controller.php
View File

@@ -35,6 +35,7 @@ use ReflectionClass;
use SetupPage;
use SetupUtils;
use Twig\Error\Error;
use Twig\Error\SyntaxError;
use utils;
use WebPage;
use ZipArchive;
@@ -662,6 +663,9 @@ abstract class Controller extends AbstractController
{
return $this->m_oTwig->render($sName.'.'.$sTemplateFileExtension.'.twig', $aParams);
}
catch (SyntaxError $e) {
IssueLog::Error($e->getMessage().' - file: '.$e->getFile().'('.$e->getLine().')');
}
catch (Error $e) {
if (strpos($e->getMessage(), 'Unable to find template') === false)
{

2
tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php
View File

@@ -146,6 +146,8 @@ abstract class ItopDataTestCase extends ItopTestCase
EventService::UnRegisterListener($sListenerId);
}
CMDBObject::SetCurrentChange(null);
parent::tearDown();
}