makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14807] Updates Twig

Browse source 
PHPBB3-14807
This commit is contained in:
Tristan Darricau 2016-10-02 19:24:45 +02:00
parent b28fe0a7fa
commit 7a5fbd0257
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/composer.lock generated
View file

@ -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",

11
phpBB/phpbb/template/twig/loader.php
View file

@ -12,6 +12,7 @@
*/
namespace phpbb\template\twig;
use Twig_Loader_Filesystem;
/**
* Twig Template loader
@ -100,6 +101,16 @@ class loader extends \Twig_Loader_Filesystem
return;
}
/**
* 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
*