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

Revert "merged branch Cottser/master (PR #1071)"

Browse Source 
This reverts commit 2f5c9899a4, reversing
changes made to 4e7094f6a3.

Conflicts:
	lib/Twig/Environment.php
This commit is contained in:
Fabien Potencier
2013-10-31 13:17:35 +01:00
parent 43b8338e04
commit bc32ed81d5
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Environment.php
+1 -9
View File
@@ -44,7 +44,6 @@ class Twig_Environment
protected $functionCallbacks;
protected $filterCallbacks;
protected $staging;
protected $templateClasses;
/**
* Constructor.
@@ -108,7 +107,6 @@ class Twig_Environment
$this->setCache($options['cache']);
$this->functionCallbacks = array();
$this->filterCallbacks = array();
$this->templateClasses = array();
$this->addExtension(new Twig_Extension_Core());
$this->addExtension(new Twig_Extension_Escaper($options['autoescape']));
@@ -264,13 +262,7 @@ class Twig_Environment
*/
public function getTemplateClass($name, $index = null)
{
$suffix = null === $index ? '' : '_'.$index;
$cls = $name.$suffix;
if (isset($this->templateClasses[$cls])) {
return $this->templateClasses[$cls];
}
return $this->templateClasses[$cls] = $this->templateClassPrefix.hash('sha256', $this->getLoader()->getCacheKey($name)).$suffix;
return $this->templateClassPrefix.hash('sha256', $this->getLoader()->getCacheKey($name)).(null === $index ? '' : '_'.$index);
}
/**