From 32af68d90441d7a2a3abc1837d1abd5c9cdaf94b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 20 May 2010 11:30:20 +0200 Subject: [PATCH] added the filename when throwing an exception about a non-empty body in a child template --- lib/Twig/Parser.php | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/Twig/Parser.php b/lib/Twig/Parser.php index 6d431ab..d3dd1d7 100644 --- a/lib/Twig/Parser.php +++ b/lib/Twig/Parser.php @@ -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()); -- 1.7.2.5