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

N°3512 fix setup crashing if env-production doesn't exist

Browse Source
This commit is contained in:
Pierre Goiffon
2020-12-11 09:26:19 +01:00
parent 50342b6dfe
commit e3895f284b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sources/Renderer/BlockRenderer.php
View File

@@ -52,7 +52,13 @@ class BlockRenderer
*/
public function __construct(iUIBlock $oBlock, array $aContextParams = [])
{
$aAdditionalPaths = array_merge(static::TWIG_ADDITIONAL_PATHS, [APPROOT.'env-'.utils::GetCurrentEnvironment()]);
$aAdditionalPaths = static::TWIG_ADDITIONAL_PATHS;
$sCurrentEnvPath = APPROOT.'env-'.utils::GetCurrentEnvironment();
if (file_exists($sCurrentEnvPath)) {
$aAdditionalPaths[] = $sCurrentEnvPath;
}
if (null === static::$oTwigEnv) {
static::$oTwigEnv = TwigHelper::GetTwigEnvironment(static::TWIG_BASE_PATH, $aAdditionalPaths);
}