merged branch vicb/hinclude/global_template (PR #7119)

fabpot · fabpot · commit aa428fe12b67 · 2013-02-20T23:02:07.000+01:00
This PR was merged into the 2.2 branch. Commits ------- 171cff0 [FrameworkBundle] Fix a BC for Hinclude global template Discussion ---------- [FrameworkBundle] Fix a BC break for Hinclude global template @fabpot should the one who broke BC write a UT for this ? (I won't have time in the next few days).
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -365,7 +365,7 @@ private function registerTemplatingConfiguration(array $config, $ide, ContainerB
 
         $container->setParameter('templating.helper.code.file_link_format', isset($links[$ide]) ? $links[$ide] : $ide);
         $container->setParameter('templating.helper.form.resources', $config['form']['resources']);
-        $container->setParameter('templating.hinclude.default_template', $config['hinclude_default_template']);
+        $container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);
 
         if ($container->getParameter('kernel.debug')) {
             $loader->load('templating_debug.xml');
