diff --git a/src/Symfony/Bundle/TwigBundle/Extension/FormExtension.php b/src/Symfony/Bundle/TwigBundle/Extension/FormExtension.php index d6cc7471e2fa..86018ea35d8d 100644 --- 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 index 65f6ae77c03e..d5a4a6cc0857 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml +++ b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml @@ -13,7 +13,9 @@ Symfony\Bundle\TwigBundle\Loader\Loader Symfony\Bundle\TwigBundle\Renderer\Renderer - + + TwigBundle::form.twig +