From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Sun, 5 Jun 2011 10:07:30 +0000 (+0200)
Subject: fixed Twig_Error when the exception is thrown from within the generated template
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=3cf357391a243af489c84c4cb2c905a2a89e589a;p=web%2Fkonrad%2Ftwig.git

fixed Twig_Error when the exception is thrown from within the generated template
---

diff --git a/lib/Twig/Error.php b/lib/Twig/Error.php
index 5e6974a..d4abdc4 100644
--- a/lib/Twig/Error.php
+++ b/lib/Twig/Error.php
@@ -156,16 +156,17 @@ class Twig_Error extends Exception
                 return array($currentLine, $currentFile);
             }
 
-            $trace = $traces[$i - 1];
-            if (!isset($trace['line'])) {
-                $trace['line'] = -log(0);
+            if (0 === $i) {
+                $line = $e->getLine();
+            } else {
+                $line = isset($traces[$i - 1]['line']) ? $traces[$i - 1]['line'] : -log(0);
             }
 
             $tokens = token_get_all(file_get_contents($r->getFilename()));
             $templateline = -1;
             $template = null;
             while ($token = array_shift($tokens)) {
-                if (isset($token[2]) && $token[2] >= $trace['line']) {
+                if (isset($token[2]) && $token[2] >= $line) {
                     return array($templateline, $template);
                 }