symfony
diff --git a/‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
+6-4Lines changed: 6 additions & 4 deletions b/‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php
+6-4Lines changed: 6 additions & 4 deletions
diff --git a/‎src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/TwigBundle/Resources/config/templating.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/config/templating.xml
-2Lines changed: 0 additions & 2 deletions b/‎src/Symfony/Bundle/TwigBundle/Resources/config/templating.xml
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/Resources/config/templating.xml
-2Lines changed: 0 additions & 2 deletions
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
@@ -88,11 +88,13 @@ public function process(ContainerBuilder $container)
             $container->getDefinition('twig.extension.debug')->addTag('twig.extension');
         }
 
-        if (!$container->has('templating')) {
-            $loader = $container->getDefinition('twig.loader.native_filesystem');
-            $loader->addTag('twig.loader');
-            $loader->setMethodCalls($container->getDefinition('twig.loader.filesystem')->getMethodCalls());
+        $twigLoader = $container->getDefinition('twig.loader.native_filesystem');
+        if ($container->has('templating')) {
+            $loader = $container->getDefinition('twig.loader.filesystem');
+            $loader->setMethodCalls($twigLoader->getMethodCalls());
 
+            $twigLoader->clearTag('twig.loader');
+        } else {
             $container->setAlias('twig.loader.filesystem', new Alias('twig.loader.native_filesystem', false));
         }
 
 
@@ -77,7 +77,7 @@ public function load(array $configs, ContainerBuilder $container)
         $envConfiguratorDefinition->replaceArgument(4, $config['number_format']['decimal_point']);
         $envConfiguratorDefinition->replaceArgument(5, $config['number_format']['thousands_separator']);
 
-        $twigFilesystemLoaderDefinition = $container->getDefinition('twig.loader.filesystem');
+        $twigFilesystemLoaderDefinition = $container->getDefinition('twig.loader.native_filesystem');
 
         // register user-configured paths
         foreach ($config['paths'] as $path => $namespace) {
 
@@ -10,8 +10,6 @@
             <tag name="twig.loader"/>
         </service>
 
-        <service id="twig.loader" alias="twig.loader.filesystem" />
-
         <service id="templating.engine.twig" class="%templating.engine.twig.class%" public="false">
             <argument type="service" id="twig" />
             <argument type="service" id="templating.name_parser" />
 
@@ -53,6 +53,7 @@
 
         <service id="twig.loader.native_filesystem" class="Twig_Loader_Filesystem" public="false">
             <argument type="collection" />
+            <tag name="twig.loader"/>
         </service>
 
         <service id="twig.loader.chain" class="%twig.loader.chain.class%" public="false"/>