Merge remote branch 'upstream/remove_template_helper'

Conflicts: Resources/config/twig.xml
Ases · Mar 28, 2011 · 8fb46bc · 8fb46bc
2 parents c309cf6 + cb09d80
commit 8fb46bc
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 187 deletions.
diff --git a/DependencyInjection/FOSUserExtension.php b/DependencyInjection/FOSUserExtension.php
@@ -24,7 +24,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
         $loader->load(sprintf('%s.xml', $config['db_driver']));
 
-        foreach (array('controller', 'templating', 'twig', 'form', 'validator', 'security', 'util', 'listener') as $basename) {
+        foreach (array('controller', 'form', 'validator', 'security', 'util', 'listener') as $basename) {
             $loader->load(sprintf('%s.xml', $basename));
         }
 

diff --git a/Resources/config/templating.xml b/Resources/config/templating.xml
diff --git a/Resources/config/twig.xml b/Resources/config/twig.xml
diff --git a/Templating/Helper/SecurityHelper.php b/Templating/Helper/SecurityHelper.php
diff --git a/Twig/UserExtension.php b/Twig/UserExtension.php