moved default form template to the DIC config

symfony · Dec 12, 2010 · 30f231d · 30f231d
1 parent abe8047
commit 30f231d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Symfony/Bundle/TwigBundle/Extension/FormExtension.php b/src/Symfony/Bundle/TwigBundle/Extension/FormExtension.php
@@ -35,9 +35,7 @@ class FormExtension extends \Twig_Extension
     public function __construct(array $resources = array())
     {
         $this->themes = new \SplObjectStorage();
-        $this->resources = array_merge(array(
-            'TwigBundle::form.twig',
-        ), $resources);
+        $this->resources = $resources;
     }
 
     /**

diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -13,7 +13,9 @@
         </parameter>
         <parameter key="twig.loader.class">Symfony\Bundle\TwigBundle\Loader\Loader</parameter>
         <parameter key="twig.renderer.class">Symfony\Bundle\TwigBundle\Renderer\Renderer</parameter>
-        <parameter key="twig.form.resources" type="collection"></parameter>
+        <parameter key="twig.form.resources" type="collection">
+            <parameter>TwigBundle::form.twig</parameter>
+        </parameter>
     </parameters>
 
     <services>