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 some possible warnings

Browse Source
This commit is contained in:
Fabien Potencier
2012-09-16 16:32:36 +02:00
parent f0d0d6da87
commit 7e5acd1fb3
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Loader/Filesystem.php
+11 -4
View File
@@ -105,7 +105,13 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface
throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist.', $path));
}
array_unshift($this->paths[$namespace], rtrim($path, '/\\'));
$path = rtrim($path, '/\\');
if (!isset($this->paths[$namespace])) {
$this->paths[$namespace][] = $path;
} else {
array_unshift($this->paths[$namespace], $path);
}
}
/**
@@ -161,13 +167,14 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface
}
$namespace = substr($name, 1, $pos - 1);
if (!isset($this->paths[$namespace])) {
throw new \Twig_Error_Loader(sprintf('There are no registered paths for namespace "%s".', $namespace));
}
$name = substr($name, $pos + 1);
}
if (!isset($this->paths[$namespace])) {
throw new \Twig_Error_Loader(sprintf('There are no registered paths for namespace "%s".', $namespace));
}
foreach ($this->paths[$namespace] as $path) {
if (is_file($path.'/'.$name)) {
return $this->cache[$name] = $path.'/'.$name;