From: Fabien Potencier Date: Fri, 11 Jun 2010 05:10:43 +0000 (+0200) Subject: fixed infinite loop in inheritance (closes #66) X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=40b16eccf8496abac7cc5acdb8db142f217dabcb;p=web%2Fkonrad%2Ftwig.git fixed infinite loop in inheritance (closes #66) --- diff --git a/lib/Twig/Template.php b/lib/Twig/Template.php index 812a1b3..4e486c1 100644 --- a/lib/Twig/Template.php +++ b/lib/Twig/Template.php @@ -27,7 +27,7 @@ abstract class Twig_Template extends Twig_Resource implements Twig_TemplateInter protected function getParent($context, $parents) { - return call_user_func($parents[0], $context, array_slice($parents, 0)); + return call_user_func($parents[0], $context, array_slice($parents, 1)); } public function pushBlocks($blocks) diff --git a/test/fixtures/tags/inheritance/multiple.test b/test/fixtures/tags/inheritance/multiple.test new file mode 100644 index 0000000..4aba998 --- /dev/null +++ b/test/fixtures/tags/inheritance/multiple.test @@ -0,0 +1,12 @@ +--TEST-- +"extends" tag +--TEMPLATE-- +{% extends "layout.twig" %}{% block content %}{% parent %}index {% endblock %} +--TEMPLATE(layout.twig)-- +{% extends "base.twig" %}{% block content %}{% parent %}layout {% endblock %} +--TEMPLATE(base.twig)-- +{% block content %}base {% endblock %} +--DATA-- +return array() +--EXPECT-- +base layout index