diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-05-20 09:32:10 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-05-20 09:32:10 +0200 |
| commit | 023f15f5feaf731d6c5ce283ab11f8448e3d05c4 (patch) | |
| tree | 09996f816fc42a5681dd9f63f7a8dd598604ba3a | |
| parent | c5493c2bb8e56e59cb3177d62a48a61fadf95303 (diff) | |
| parent | b9ff0bbba4cf357baad32576c01f36a9f2627ffa (diff) | |
| download | forums-023f15f5feaf731d6c5ce283ab11f8448e3d05c4.tar forums-023f15f5feaf731d6c5ce283ab11f8448e3d05c4.tar.gz forums-023f15f5feaf731d6c5ce283ab11f8448e3d05c4.tar.bz2 forums-023f15f5feaf731d6c5ce283ab11f8448e3d05c4.tar.xz forums-023f15f5feaf731d6c5ce283ab11f8448e3d05c4.zip | |
Merge pull request #3621 from Nicofuma/ticket/13849
[ticket/13849] Fix development environment
| -rw-r--r-- | phpBB/phpbb/di/extension/core.php | 6 | ||||
| -rw-r--r-- | tests/di/fixtures/config/test/container/environment.yml | 1 | ||||
| -rw-r--r-- | tests/di/fixtures/other_config/test/container/environment.yml | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/phpbb/di/extension/core.php b/phpBB/phpbb/di/extension/core.php index c9e2d4dc5b..91b321a684 100644 --- a/phpBB/phpbb/di/extension/core.php +++ b/phpBB/phpbb/di/extension/core.php @@ -71,7 +71,7 @@ class core extends Extension // Set the Twig options if defined in the environment $definition = $container->getDefinition('template.twig.environment'); - $twig_environment_options = $definition->getArgument(6); + $twig_environment_options = $definition->getArgument(7); if ($config['twig']['debug']) { $twig_environment_options['debug'] = true; @@ -80,8 +80,8 @@ class core extends Extension { $twig_environment_options['auto_reload'] = true; } - // Replace the 6th argument, the options passed to the environment - $definition->replaceArgument(6, $twig_environment_options); + // Replace the 8th argument, the options passed to the environment + $definition->replaceArgument(7, $twig_environment_options); if ($config['twig']['enable_debug_extension']) { diff --git a/tests/di/fixtures/config/test/container/environment.yml b/tests/di/fixtures/config/test/container/environment.yml index 0873078844..14c986d123 100644 --- a/tests/di/fixtures/config/test/container/environment.yml +++ b/tests/di/fixtures/config/test/container/environment.yml @@ -22,4 +22,5 @@ services: - ~ - ~ - ~ + - ~ - [] diff --git a/tests/di/fixtures/other_config/test/container/environment.yml b/tests/di/fixtures/other_config/test/container/environment.yml index 2aa29db2eb..e285b1b781 100644 --- a/tests/di/fixtures/other_config/test/container/environment.yml +++ b/tests/di/fixtures/other_config/test/container/environment.yml @@ -22,4 +22,5 @@ services: - ~ - ~ - ~ + - ~ - [] |