diff options
| author | François-Xavier de Guillebon <fdn2@3ds.com> | 2018-01-16 12:46:48 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-09 21:30:12 +0200 |
| commit | 40e61e4d1ec3da2ea48efda401b0044f2aff6071 (patch) | |
| tree | ca1f7990ca15f09d0eb6c76ba60b2551304e94ec /phpBB/phpbb/template/twig/extension.php | |
| parent | ff35f65064bebd44837802765937227ab0f59b37 (diff) | |
| download | forums-40e61e4d1ec3da2ea48efda401b0044f2aff6071.tar forums-40e61e4d1ec3da2ea48efda401b0044f2aff6071.tar.gz forums-40e61e4d1ec3da2ea48efda401b0044f2aff6071.tar.bz2 forums-40e61e4d1ec3da2ea48efda401b0044f2aff6071.tar.xz forums-40e61e4d1ec3da2ea48efda401b0044f2aff6071.zip | |
[ticket/15508] Remove call to getEnvironment() from parser
PHPBB3-15508
Diffstat (limited to 'phpBB/phpbb/template/twig/extension.php')
| -rw-r--r-- | phpBB/phpbb/template/twig/extension.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index b40048ef11..c5b3db1aaf 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -18,6 +18,9 @@ class extension extends \Twig_Extension /** @var \phpbb\template\context */ protected $context; + /** @var \phpbb\template\twig\environment */ + protected $environment; + /** @var \phpbb\language\language */ protected $language; @@ -25,12 +28,14 @@ class extension extends \Twig_Extension * Constructor * * @param \phpbb\template\context $context + * @param \phpbb\template\twig\environment $environment * @param \phpbb\language\language $language * @return \phpbb\template\twig\extension */ - public function __construct(\phpbb\template\context $context, $language) + public function __construct(\phpbb\template\context $context, \phpbb\template\twig\environment $environment, $language) { $this->context = $context; + $this->environment = $environment; $this->language = $language; } @@ -56,9 +61,9 @@ class extension extends \Twig_Extension new \phpbb\template\twig\tokenparser\includeparser, new \phpbb\template\twig\tokenparser\includejs, new \phpbb\template\twig\tokenparser\includecss, - new \phpbb\template\twig\tokenparser\event, - new \phpbb\template\twig\tokenparser\includephp, - new \phpbb\template\twig\tokenparser\php, + new \phpbb\template\twig\tokenparser\event($this->environment), + new \phpbb\template\twig\tokenparser\includephp($this->environment), + new \phpbb\template\twig\tokenparser\php($this->environment), ); } |