mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 22:51:23 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3621 from Nicofuma/ticket/13849

Browse Source 
[ticket/13849] Fix development environment
This commit is contained in:
Marc Alexander
2015-05-20 09:32:10 +02:00
parent c5493c2bb8 b9ff0bbba4
commit 023f15f5fe
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/di/extension/core.php
View File

@@ -71,7 +71,7 @@ class core extends Extension
// Set the Twig options if defined in the environment // Set the Twig options if defined in the environment
$definition = $container->getDefinition('template.twig.environment'); $definition = $container->getDefinition('template.twig.environment');
$twig_environment_options = $definition->getArgument(6); $twig_environment_options = $definition->getArgument(7);
if ($config['twig']['debug']) if ($config['twig']['debug'])
{ {
$twig_environment_options['debug'] = true; $twig_environment_options['debug'] = true;
@@ -80,8 +80,8 @@ class core extends Extension
{ {
$twig_environment_options['auto_reload'] = true; $twig_environment_options['auto_reload'] = true;
} }
// Replace the 6th argument, the options passed to the environment // Replace the 8th argument, the options passed to the environment
$definition->replaceArgument(6, $twig_environment_options); $definition->replaceArgument(7, $twig_environment_options);
if ($config['twig']['enable_debug_extension']) if ($config['twig']['enable_debug_extension'])
{ {

1
tests/di/fixtures/config/test/container/environment.yml
View File

@@ -22,4 +22,5 @@ services:
- ~ - ~
- ~ - ~
- ~ - ~
- ~
- [] - []

1
tests/di/fixtures/other_config/test/container/environment.yml
View File

@@ -22,4 +22,5 @@ services:
- ~ - ~
- ~ - ~
- ~ - ~
- ~
- [] - []