1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 06:36:39 +02:00

Merge pull request from Nicofuma/ticket/13849

[ticket/13849] Fix development environment
This commit is contained in:
Marc Alexander
2015-05-20 09:32:10 +02:00
3 changed files with 5 additions and 3 deletions
phpBB/phpbb/di/extension
tests/di/fixtures
config
test
other_config
test

@ -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'])
{

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

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