[Form] Make theming form prototypes consistent (start by looking for a '_<id>_<section>' block)

src/Symfony/Bridge/Twig/Extension/FormExtension.php

@@ -226,7 +226,7 @@ class FormExtension extends \Twig_Extension
 
         $blocks = $this->getBlocks($view);
         $types = $view->get('types');
-        array_unshift($types, '_'.$view->get('id'));
+        array_unshift($types, '_'.$view->get('proto_id', $view->get('id')));
 
         foreach ($types as $type) {
             $block = $type.'_'.$section;

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php

@@ -203,7 +203,7 @@ class FormHelper extends Helper
 
         $template = null;
         $blocks = $view->get('types');
-        array_unshift($blocks, '_'.$view->get('id'));
+        array_unshift($blocks, '_'.$view->get('proto_id', $view->get('id')));
 
         foreach ($blocks as &$block) {
             $block = $block.'_'.$section;