Commit 7fec6664 authored by Fabien Potencier's avatar Fabien Potencier

bug #1643 add-request-stack-check (nymo)

This PR was merged into the 2.3.x-dev branch.

Discussion
----------

add-request-stack-check

move add extension to if clause fixes #1642

Commits
-------

e30d7775 move add extension to if clause fixes #1642
parents 1c86d1a8 e30d7775
...@@ -89,6 +89,7 @@ class TwigServiceProvider implements ServiceProviderInterface ...@@ -89,6 +89,7 @@ class TwigServiceProvider implements ServiceProviderInterface
if (isset($app['request_stack'])) { if (isset($app['request_stack'])) {
$twig->addExtension(new HttpFoundationExtension($app['request_stack'])); $twig->addExtension(new HttpFoundationExtension($app['request_stack']));
$twig->addExtension(new RoutingExtension($app['url_generator'])); $twig->addExtension(new RoutingExtension($app['url_generator']));
$twig->addExtension(new WebLinkExtension($app['request_stack']));
} }
if (isset($app['translator'])) { if (isset($app['translator'])) {
...@@ -133,7 +134,6 @@ class TwigServiceProvider implements ServiceProviderInterface ...@@ -133,7 +134,6 @@ class TwigServiceProvider implements ServiceProviderInterface
} }
$twig->addRuntimeLoader($app['twig.runtime_loader']); $twig->addRuntimeLoader($app['twig.runtime_loader']);
$twig->addExtension(new WebLinkExtension($app['request_stack']));
} }
return $twig; return $twig;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment