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

cast $name to string ($name can be an object implementing __toString function)

Browse Source
This commit is contained in:
Jeremy Marc
2012-10-26 15:30:04 -07:00
parent 61393dc9fb
commit c5d351dcd2
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Loader/Chain.php
+2
View File
@@ -70,6 +70,8 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
*/ */
public function exists($name) public function exists($name)
{ {
$name = (string) $name;
if (isset($this->hasSourceCache[$name])) { if (isset($this->hasSourceCache[$name])) {
return $this->hasSourceCache[$name]; return $this->hasSourceCache[$name];
} }
lib/Twig/Loader/Filesystem.php
+3
View File
@@ -139,6 +139,7 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
*/ */
public function exists($name) public function exists($name)
{ {
$name = (string) $name;
if (isset($this->cache[$name])) { if (isset($this->cache[$name])) {
return true; return true;
} }
@@ -162,6 +163,8 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
protected function findTemplate($name) protected function findTemplate($name)
{ {
$name = (string) $name;
// normalize name // normalize name
$name = preg_replace('#/{2,}#', '/', strtr($name, '\\', '/')); $name = preg_replace('#/{2,}#', '/', strtr($name, '\\', '/'));