diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[TwigBundle] fixed inheritance problem

Browse Source
This commit is contained in:
Fabien Potencier 2011-02-04 22:14:25 +01:00
parent 67c9fdf412
commit e2ea634df4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Symfony/Bundle/TwigBundle/Extension/FormExtension.php
View File

@ -261,9 +261,8 @@ class FormExtension extends \Twig_Extension
$resource = $this->environment->loadTemplate($resource);
}
// an array of blockName => template
$blocks = array();
foreach ($resource->getBlockNames() as $name) {
foreach ($this->getBlockNames($resource) as $name) {
$blocks[$name] = $resource;
}
@ -273,6 +272,17 @@ class FormExtension extends \Twig_Extension
return $templates;
}
protected function getBlockNames($resource)
{
$names = $resource->getBlockNames();
$parent = $resource;
while (false !== $parent = $parent->getParent(array())) {
$names = array_merge($names, $parent->getBlockNames());
}
return array_unique($names);
}
/**
* Returns the name of the extension.
*