fixed nested embed tag calls

This commit is contained in:
Fabien Potencier
2012-06-26 17:59:41 +02:00
parent 73426117f9
commit b7ca23f8be
3 changed files with 44 additions and 2 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
* 1.8.4 (2012-XX-XX)
* n/a
* fixed nested embed tag calls
* 1.8.3 (2012-06-17)
+1 -1
View File
@@ -275,7 +275,7 @@ class Twig_Parser implements Twig_ParserInterface
public function embedTemplate(Twig_Node_Module $template)
{
$template->setIndex(count($this->embeddedTemplates) + 1);
$template->setIndex(mt_rand());
$this->embeddedTemplates[] = $template;
}
@@ -0,0 +1,42 @@
--TEST--
"embed" tag
--TEMPLATE--
{% embed "foo.twig" %}
{% block c1 %}
{{ parent() }}
{% embed "foo.twig" %}
{% block c1 %}
{{ parent() }}
block1extended
{% endblock %}
{% endembed %}
{% endblock %}
{% endembed %}
--TEMPLATE(foo.twig)--
A
{% block c1 %}
block1
{% endblock %}
B
{% block c2 %}
block2
{% endblock %}
C
--DATA--
return array()
--EXPECT--
A
block1
A
block1
block1extended
B
block2
C
B
block2
C