fixed filesystem loader when trying to load a non-file

twigphp · Feb 16, 2015 · fd6f28b · fd6f28b
1 parent 8e32c50
commit fd6f28b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,6 @@
 * 1.18.1 (2015-XX-XX)
 
- * n/a
+ * fixed filesystem loader when trying to load non-files (like directories)
 
 * 1.18.0 (2015-01-25)
 

diff --git a/lib/Twig/Loader/Filesystem.php b/lib/Twig/Loader/Filesystem.php
@@ -183,10 +183,11 @@ protected function findTemplate($name)
         }
 
         foreach ($this->paths[$namespace] as $path) {
-            if (false !== $realpath = realpath($path.'/'.$shortname)) {
-                return $this->cache[$name] = $realpath;
-            }
             if (is_file($path.'/'.$shortname)) {
+                if (false !== $realpath = realpath($path.'/'.$shortname)) {
+                    return $this->cache[$name] = $realpath;
+                }
+
                 return $this->cache[$name] = $path.'/'.$shortname;
             }
         }