symfony
diff --git a/‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+1Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
+1Lines changed: 1 addition & 0 deletions
diff --git a/‎src/Symfony/Bundle/TwigBundle/TemplateIterator.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/TemplateIterator.php
+4-1Lines changed: 4 additions & 1 deletion b/‎src/Symfony/Bundle/TwigBundle/TemplateIterator.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/TemplateIterator.php
+4-1Lines changed: 4 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
+2-1Lines changed: 2 additions & 1 deletion b/‎src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Tests/TemplateIteratorTest.php
+2-1Lines changed: 2 additions & 1 deletion
@@ -41,6 +41,7 @@
             <argument type="service" id="kernel" />
             <argument>%kernel.root_dir%</argument>
             <argument type="collection" /> <!-- Twig paths -->
+            <argument>%twig.default_path%</argument>
         </service>
 
         <service id="twig.template_cache_warmer" class="Symfony\Bundle\TwigBundle\CacheWarmer\TemplateCacheWarmer">
 
@@ -25,17 +25,19 @@ class TemplateIterator implements \IteratorAggregate
     private $rootDir;
     private $templates;
     private $paths;
+    private $defaultPath;
 
     /**
      * @param KernelInterface $kernel  A KernelInterface instance
      * @param string          $rootDir The directory where global templates can be stored
      * @param array           $paths   Additional Twig paths to warm
      */
-    public function __construct(KernelInterface $kernel, $rootDir, array $paths = array())
+    public function __construct(KernelInterface $kernel, $rootDir, array $paths = array(), $defaultPath = null)
     {
         $this->kernel = $kernel;
         $this->rootDir = $rootDir;
         $this->paths = $paths;
+        $this->defaultPath = $defaultPath;
     }
 
     /**
@@ -48,6 +50,7 @@ public function getIterator()
         }
 
         $this->templates = $this->findTemplatesInDirectory($this->rootDir.'/Resources/views');
+        $this->templates = array_merge($this->templates, $this->findTemplatesInDirectory($this->defaultPath));
         foreach ($this->kernel->getBundles() as $bundle) {
             $name = $bundle->getName();
             if ('Bundle' === substr($name, -6)) {
 
@@ -25,14 +25,15 @@ public function testGetIterator()
         $kernel->expects($this->any())->method('getBundles')->will($this->returnValue(array(
             $bundle,
         )));
-        $iterator = new TemplateIterator($kernel, __DIR__.'/Fixtures/templates', array(__DIR__.'/Fixtures/templates/Foo' => 'Foo'));
+        $iterator = new TemplateIterator($kernel, __DIR__.'/Fixtures/templates', array(__DIR__.'/Fixtures/templates/Foo' => 'Foo'), __DIR__.'/DependencyInjection/Fixtures/templates');
 
         $sorted = iterator_to_array($iterator);
         sort($sorted);
         $this->assertEquals(
             array(
                 '@Bar/index.html.twig',
                 '@Foo/index.html.twig',
+                'bundles/TwigBundle/layout.html.twig',
                 'layout.html.twig',
                 'sub/sub.html.twig',
             ),