diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 19:24:45 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-10-02 19:24:45 +0200 |
| commit | 7a5fbd0257d7b15b8230fa6c60581cc197cb1a47 (patch) | |
| tree | 381b20663e7bae6cd594065070eb9b61af67cefd /phpBB/phpbb/template/twig/loader.php | |
| parent | b28fe0a7fa128e3fc055e8a661673cee894ceee5 (diff) | |
| download | forums-7a5fbd0257d7b15b8230fa6c60581cc197cb1a47.tar forums-7a5fbd0257d7b15b8230fa6c60581cc197cb1a47.tar.gz forums-7a5fbd0257d7b15b8230fa6c60581cc197cb1a47.tar.bz2 forums-7a5fbd0257d7b15b8230fa6c60581cc197cb1a47.tar.xz forums-7a5fbd0257d7b15b8230fa6c60581cc197cb1a47.zip | |
[ticket/14807] Updates Twig
PHPBB3-14807
Diffstat (limited to 'phpBB/phpbb/template/twig/loader.php')
| -rw-r--r-- | phpBB/phpbb/template/twig/loader.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/phpbb/template/twig/loader.php b/phpBB/phpbb/template/twig/loader.php index 8b12188a77..b2261dd8cd 100644 --- a/phpBB/phpbb/template/twig/loader.php +++ b/phpBB/phpbb/template/twig/loader.php @@ -12,6 +12,7 @@ */ namespace phpbb\template\twig; +use Twig_Loader_Filesystem; /** * Twig Template loader @@ -101,6 +102,16 @@ class loader extends \Twig_Loader_Filesystem } /** + * Adds a realpath call to fix a BC break in Twig 1.26 (https://github.com/twigphp/Twig/issues/2145) + * + * {@inheritdoc} + */ + public function addPath($path, $namespace = self::MAIN_NAMESPACE) + { + return parent::addPath($this->filesystem->realpath($path), $namespace); + } + + /** * Find the template * * Override for Twig_Loader_Filesystem::findTemplate to add support |