geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 11:56:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed guessing a template info for exceptions

Browse Source
This commit is contained in:
Martin Hasoň
2014-10-10 09:58:46 +02:00
parent 9fb15e343e
commit 42cd697667
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Error.php
+2
View File
@@ -229,6 +229,8 @@ class Twig_Error extends Exception
while ($e = array_pop($exceptions)) { while ($e = array_pop($exceptions)) {
$traces = $e->getTrace(); $traces = $e->getTrace();
array_unshift($traces, array('file' => $e->getFile(), 'line' => $e->getLine()));
while ($trace = array_shift($traces)) { while ($trace = array_shift($traces)) {
if (!isset($trace['file']) || !isset($trace['line']) || $file != $trace['file']) { if (!isset($trace['file']) || !isset($trace['line']) || $file != $trace['file']) {
continue; continue;
test/Twig/Tests/Fixtures/exceptions/undefined_trait.test
+1 -1
View File
@@ -6,4 +6,4 @@ Exception for an undefined trait
{% block bar %} {% block bar %}
{% endblock %} {% endblock %}
--EXCEPTION-- --EXCEPTION--
Twig_Error_Runtime: Block "foobar" is not defined in trait "foo" in "index.twig". Twig_Error_Runtime: Block "foobar" is not defined in trait "foo" in "index.twig" at line 2.