diff options
| -rw-r--r-- | phpBB/composer.lock | 16 | ||||
| -rw-r--r-- | phpBB/phpbb/template/twig/loader.php | 11 |
2 files changed, 18 insertions, 9 deletions
diff --git a/phpBB/composer.lock b/phpBB/composer.lock index f5d025a04b..3bcf0399eb 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -1661,16 +1661,16 @@ }, { "name": "twig/twig", - "version": "v1.24.1", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512" + "reference": "81c2b5fd36581370c7731387f05dcdb577050513" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/3566d311a92aae4deec6e48682dc5a4528c4a512", - "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/81c2b5fd36581370c7731387f05dcdb577050513", + "reference": "81c2b5fd36581370c7731387f05dcdb577050513", "shasum": "" }, "require": { @@ -1683,7 +1683,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.24-dev" + "dev-master": "1.26-dev" } }, "autoload": { @@ -1718,7 +1718,7 @@ "keywords": [ "templating" ], - "time": "2016-05-30 09:11:59" + "time": "2016-10-02 16:19:13" }, { "name": "zendframework/zend-code", @@ -2624,9 +2624,7 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien@symfony.com" } ], "description": "Pimple is a simple Dependency Injection Container for PHP 5.3", 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 |