diff options
| author |   Marc Alexander <admin@m-a-styles.de> | 2018-09-13 19:08:09 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-09-13 19:08:09 +0200 |
| commit | 9c55100c82e79dd85c58e3778d7cdaa4d64d5219 (patch) | |
| tree | 7a29ef6556bc1265ed753ebf9b860aed7b6d8440 /phpBB/phpbb/di | |
| parent | Merge pull request #5347 from marc1706/ticket/15746-master (diff) | |
| parent | [ticket/12623] Add install dir during tests (diff) | |
| download | phpbb-9c55100c82e79dd85c58e3778d7cdaa4d64d5219.tar.gz phpbb-9c55100c82e79dd85c58e3778d7cdaa4d64d5219.tar.bz2 phpbb-9c55100c82e79dd85c58e3778d7cdaa4d64d5219.zip | |
Merge pull request #5330 from rubencm/ticket/12623
[ticket/12623] Add allow_install_dir
Diffstat (limited to 'phpBB/phpbb/di')
| -rw-r--r-- | phpBB/phpbb/di/extension/container_configuration.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/di/extension/core.php | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php index 3a6502a4b3..67e12ed77b 100644 --- a/phpBB/phpbb/di/extension/container_configuration.php +++ b/phpBB/phpbb/di/extension/container_configuration.php @@ -31,6 +31,7 @@ class container_configuration implements ConfigurationInterface $rootNode ->children() ->booleanNode('require_dev_dependencies')->defaultValue(false)->end() + ->booleanNode('allow_install_dir')->defaultValue(false)->end() ->arrayNode('debug') ->addDefaultsIfNotSet() ->children() diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php index 75a037871f..cdba25f13b 100644 --- a/phpBB/phpbb/di/extension/core.php +++ b/phpBB/phpbb/di/extension/core.php @@ -72,6 +72,8 @@ class core extends Extension } } + $container->setParameter('allow_install_dir', $config['allow_install_dir']); + // Set the Twig options if defined in the environment $definition = $container->getDefinition('template.twig.environment'); $twig_environment_options = $definition->getArgument(static::TWIG_OPTIONS_POSITION); |