Simplified everything

symfony · fabpot · Mar 3, 2016 · Oct 11, 2015 · Oct 11, 2015 · Jan 19, 2016
commit 0134d7678516f6c9ec56059e0596685c501724b4
diff --git a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
@@ -77,20 +77,18 @@ protected function findTemplate($template, $throw = true)
        try {
            $file = parent::findTemplate($logicalName);
        } catch (\Twig_Error_Loader $e) {
-            $previous = $e;
-            $errorMessage = $e->getMessage();
+            $twigLoaderException = $e;

            // for BC
            try {
                $template = $this->parser->parse($template);
                $file = $this->locator->locate($template);
            } catch (\Exception $e) {
-                $previous = $e;
            }
        }

        if (false === $file || null === $file) {
-            throw new \Twig_Error_Loader($errorMessage, -1, null, $previous);
+            throw $twigLoaderException;
        }

        return $this->cache[$logicalName] = $file;