geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-14 11:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed Twig cache sharing when used with different versions of PHP

Browse Source
This commit is contained in:
Fabien Potencier
2016-09-19 17:21:48 -07:00
parent 0da2dd4eba
commit ecd020da9f
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -1,5 +1,6 @@
* 1.25.0 (2016-XX-XX) * 1.25.0 (2016-XX-XX)
* fixed Twig cache sharing when used with different versions of PHP
* removed embed parent workaround for simple use cases * removed embed parent workaround for simple use cases
* deprecated the ability to store non Node instances in Node::$nodes * deprecated the ability to store non Node instances in Node::$nodes
* deprecated Twig_Environment::getLexer(), Twig_Environment::getParser(), Twig_Environment::getCompiler() * deprecated Twig_Environment::getLexer(), Twig_Environment::getParser(), Twig_Environment::getCompiler()
lib/Twig/Environment.php
+1
View File
@@ -312,6 +312,7 @@ class Twig_Environment
$key = $this->getLoader()->getCacheKey($name); $key = $this->getLoader()->getCacheKey($name);
$key .= json_encode(array_keys($this->extensions)); $key .= json_encode(array_keys($this->extensions));
$key .= function_exists('twig_template_get_attributes'); $key .= function_exists('twig_template_get_attributes');
$key .= ':'.PHP_MAJOR_VERSION.':'.PHP_MINOR_VERSION;
return $this->templateClassPrefix.hash('sha256', $key).(null === $index ? '' : '_'.$index); return $this->templateClassPrefix.hash('sha256', $key).(null === $index ? '' : '_'.$index);
} }