Merge branch '2.7'

fabpot · fabpot · commit 22cd78c4a87e · 2015-02-12T17:07:34.000+01:00
* 2.7:
  [TwigBundle] Fix typo in ExtensionPass
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
@@ -75,7 +75,7 @@ public function process(ContainerBuilder $container)
         }
 
         if ($container->has('assets.packages')) {
-            $loader->getDefinition('twig.extension.assets')->addTag('twig.extension');
+            $container->getDefinition('twig.extension.assets')->addTag('twig.extension');
         }
 
         if (method_exists('Symfony\Bridge\Twig\AppVariable', 'setContainer')) {

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function process(ContainerBuilder $container)`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`if ($container->has('assets.packages')) {`
`78`		`- $lo 4FC9 ader->getDefinition('twig.extension.assets')->addTag('twig.extension');`
	`78`	`+ $container->getDefinition('twig.extension.assets')->addTag('twig.extension');`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`if (method_exists('Symfony\Bridge\Twig\AppVariable', 'setContainer')) {`