diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-02-02 14:48:14 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-02-02 14:48:14 +0100 |
| commit | cb04252fbd17ac718c09ecc44dab4c7627a98b35 (patch) | |
| tree | ae7b5af431cbb29a2402d70623aa5f9c4b59754c /phpBB/phpbb/template/twig/twig.php | |
| parent | dfe1761c95c0f108d95f013cdef0fd2c75f87e24 (diff) | |
| parent | d3ce584dc785cb033fb2b4f0808a62c51af4791e (diff) | |
| download | forums-cb04252fbd17ac718c09ecc44dab4c7627a98b35.tar forums-cb04252fbd17ac718c09ecc44dab4c7627a98b35.tar.gz forums-cb04252fbd17ac718c09ecc44dab4c7627a98b35.tar.bz2 forums-cb04252fbd17ac718c09ecc44dab4c7627a98b35.tar.xz forums-cb04252fbd17ac718c09ecc44dab4c7627a98b35.zip | |
Merge remote-tracking branch 'vsephpbb/ticket/12100' into develop
Diffstat (limited to 'phpBB/phpbb/template/twig/twig.php')
| -rw-r--r-- | phpBB/phpbb/template/twig/twig.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/template/twig/twig.php b/phpBB/phpbb/template/twig/twig.php index ddadcfd89a..83630f5992 100644 --- a/phpBB/phpbb/template/twig/twig.php +++ b/phpBB/phpbb/template/twig/twig.php @@ -94,8 +94,8 @@ class twig extends \phpbb\template\base $this->twig = new \phpbb\template\twig\environment( $this->config, - ($this->extension_manager) ? $this->extension_manager->all_enabled() : array(), $this->path_helper, + $this->extension_manager, $loader, array( 'cache' => (defined('IN_INSTALL')) ? false : $this->cachepath, |