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

Revert "added the possibility to pass a readable name for templates"

Browse Source 
This reverts commit 7a7c23f197.
This commit is contained in:
Fabien Potencier
2011-02-06 21:03:13 +01:00
parent 4501984e5d
commit bb7e422909
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Environment.php
+4 -9
View File
@@ -272,17 +272,12 @@ class Twig_Environment
/**
* Loads a template by name.
*
* @param string $name The template name
* @param string $short The template name to use for error messages
* @param string $name The template name
*
* @return Twig_TemplateInterface A template instance representing the given template name
*/
public function loadTemplate($name, $short = null)
public function loadTemplate($name)
{
if (null === $short) {
$short = $name;
}
$cls = $this->getTemplateClass($name);
if (isset($this->loadedTemplates[$cls])) {
@@ -291,10 +286,10 @@ class Twig_Environment
if (!class_exists($cls, false)) {
if (false === $cache = $this->getCacheFilename($name)) {
eval('?>'.$this->compileSource($this->loader->getSource($name), $short));
eval('?>'.$this->compileSource($this->loader->getSource($name), $name));
} else {
if (!file_exists($cache) || ($this->isAutoReload() && !$this->loader->isFresh($name, filemtime($cache)))) {
$this->writeCacheFile($cache, $this->compileSource($this->loader->getSource($name), $short));
$this->writeCacheFile($cache, $this->compileSource($this->loader->getSource($name), $name));
}
require_once $cache;