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

N°3567 - Migrate backoffice pages to new UIBlock system : App. upgrade (display twig errors)

Browse Source
This commit is contained in:
Eric
2021-01-19 18:09:58 +01:00
parent 6dd1807fca
commit 392cdf6058
3 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sources/application/TwigBase/Controller/Controller.php
View File

@@ -32,7 +32,6 @@ use MetaModel;
use ReflectionClass;
use SetupPage;
use SetupUtils;
use Twig_Error;
use utils;
use ZipArchive;
@@ -158,8 +157,6 @@ abstract class Controller
}
catch (Exception $e)
{
require_once(APPROOT."/setup/setuppage.class.inc.php");
http_response_code(500);
$oP = new ErrorPage(Dict::S('UI:PageTitle:FatalError'));
$oP->add("<h1>".Dict::S('UI:FatalErrorMessage')."</h1>\n");
@@ -529,20 +526,7 @@ abstract class Controller
{
throw new Exception('Not initialized. Call Controller::InitFromModule() or Controller::SetViewPath() before any display');
}
try
{
return $this->m_oTwig->render($sName.'.'.$sTemplateFileExtension.'.twig', $aParams);
}
catch (Twig_Error $e)
{
// Ignore errors
if (!utils::StartsWith($e->getMessage(), 'Unable to find template'))
{
IssueLog::Error($e->getMessage());
}
}
return '';
return TwigHelper::RenderTemplate($this->m_oTwig, $aParams, $sName, $sTemplateFileExtension, false);
}
/**