From: Fabien Potencier Date: Sat, 15 Mar 2014 10:49:13 +0000 (+0100) Subject: bug #1361 Fixed recursively calling blocks in templates with inheritance (hason) X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=98903bb83f474f134271a0ef5fc43cd09d2456e9;p=web%2Fkonrad%2Ftwig.git bug #1361 Fixed recursively calling blocks in templates with inheritance (hason) This PR was merged into the 1.15-dev branch. Discussion ---------- Fixed recursively calling blocks in templates with inheritance Replaces #1321 Fixes KnpLabs/KnpMenu#136 and KnpLabs/KnpMenu#119 Commits ------- efb7b47 Add "broken" block inheritance test case ef98ea2 Fixed recursively calling blocks in templates with inheritance --- 98903bb83f474f134271a0ef5fc43cd09d2456e9