projects
/
web/konrad/twig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
40c9668
)
Fixed guess template info for PHP 5.2
author
Martin Hasoň
<martin.hason@gmail.com>
Tue, 24 Apr 2012 08:24:52 +0000 (10:24 +0200)
committer
Martin Hasoň
<martin.hason@gmail.com>
Tue, 24 Apr 2012 09:01:43 +0000 (11:01 +0200)
lib/Twig/Error.php
patch
|
blob
|
history
diff --git
a/lib/Twig/Error.php
b/lib/Twig/Error.php
index
e32c5c9
..
8ac2a2e
100644
(file)
--- a/
lib/Twig/Error.php
+++ b/
lib/Twig/Error.php
@@
-161,6
+161,8
@@
class Twig_Error extends Exception
if (null === $this->filename) {
$this->filename = $template->getTemplateName();
}
+
+ break;
}
}
@@
-172,7
+174,7
@@
class Twig_Error extends Exception
$file = $r->getFileName();
$exceptions = array($e = $this);
- while (method_exists($e, 'getPrevious') && $e = $e->getPrevious()) {
+ while (($e instanceof self || method_exists($e, 'getPrevious')) && $e = $e->getPrevious()) {
$exceptions[] = $e;
}