Merge pull request #165 from peterrehm/fs-loader

Bugfix FS Loader
liip · Jan 27, 2017 · d82ac64 · d82ac64
2 parents 685e4f3 + 703ec21
commit d82ac64
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/Twig/Loader/FilesystemLoader.php b/Twig/Loader/FilesystemLoader.php
@@ -71,16 +71,17 @@ protected function findTemplate($template, $throw = true)
 
         $file = null;
         $previous = null;
+
         try {
-            $file = parent::findTemplate((string) $template);
-        } catch (\Twig_Error_Loader $e) {
+            $template = $this->parser->parse($template);
+            $file = $this->locator->locate($template);
+        } catch (\Exception $e) {
             $previous = $e;
 
             // for BC
             try {
-                $template = $this->parser->parse($template);
-                $file = $this->locator->locate($template);
-            } catch (\Exception $e) {
+                $file = parent::findTemplate((string) $template);
+            } catch (\Twig_Error_Loader $e) {
                 $previous = $e;
             }
         }