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

added the filename when throwing an exception about a non-empty body in a child template

Browse Source
This commit is contained in:
Fabien Potencier
2010-05-20 11:30:20 +02:00
parent a70939d4b8
commit 32af68d904
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Parser.php
+5 -8
View File
@@ -74,13 +74,6 @@ class Twig_Parser
}
if (!is_null($this->extends)) {
foreach ($this->blocks as $block) {
$block->setParent($this->extends);
}
}
if ($this->extends)
{
// check that the body only contains block references and empty text nodes
foreach ($body->getNodes() as $node)
{
@@ -89,9 +82,13 @@ class Twig_Parser
||
(!$node instanceof Twig_Node_Text && !$node instanceof Twig_Node_BlockReference)
) {
throw new Twig_SyntaxError('A template that extends another one cannot have a body', $node->getLine());
throw new Twig_SyntaxError('A template that extends another one cannot have a body', $node->getLine(), $this->stream->getFilename());
}
}
foreach ($this->blocks as $block) {
$block->setParent($this->extends);
}
}
$node = new Twig_Node_Module($body, $this->extends, $this->blocks, $this->macros, $this->stream->getFilename());