projects
/
web/konrad/twig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
914c9e6
efb7b47
)
bug #1361 Fixed recursively calling blocks in templates with inheritance (hason)
author
Fabien Potencier
<fabien.potencier@gmail.com>
Sat, 15 Mar 2014 10:49:13 +0000 (11:49 +0100)
committer
Fabien Potencier
<fabien.potencier@gmail.com>
Sat, 15 Mar 2014 10:49:13 +0000 (11:49 +0100)
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
Trivial merge
projects / web/konrad/twig.git / commitdiff