geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-13 02:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fabien Potencier
2011-06-05 12:07:30 +02:00
parent 9328df1940
commit 3cf357391a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Error.php
+5 -4
View File
@@ -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);
}