diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-10-10 21:30:13 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-10-10 21:30:13 +0200 |
| commit | 322b86da1f6b497d38fb346d233d64d97a5d2b14 (patch) | |
| tree | 146860a0d1ff4146c77eb6eaed660f053d8dda67 /phpBB/phpbb | |
| parent | 8ce95413aa2fc6295100c5f5678ac39256c01083 (diff) | |
| parent | b2711371f1267a1314ccf1de976d5432c03a2357 (diff) | |
| download | forums-322b86da1f6b497d38fb346d233d64d97a5d2b14.tar forums-322b86da1f6b497d38fb346d233d64d97a5d2b14.tar.gz forums-322b86da1f6b497d38fb346d233d64d97a5d2b14.tar.bz2 forums-322b86da1f6b497d38fb346d233d64d97a5d2b14.tar.xz forums-322b86da1f6b497d38fb346d233d64d97a5d2b14.zip | |
Merge pull request #4476 from Nicofuma/ticket/14807
[ticket/14807] Updates dependencies
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/template/twig/loader.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/phpbb/template/twig/loader.php b/phpBB/phpbb/template/twig/loader.php index 8b12188a77..d2b42852ce 100644 --- a/phpBB/phpbb/template/twig/loader.php +++ b/phpBB/phpbb/template/twig/loader.php @@ -101,6 +101,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 |