From 923c234160c1174353d6e282bb9486b267c43343 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 27 May 2011 08:12:39 +0200
Subject: [PATCH] fixed form_rest() for embedded forms (refs #1051, #1115)

---
 .../FrameworkBundle/Resources/views/Form/field_rest.html.php  | 2 +-
 .../FrameworkBundle/Resources/views/Form/form_widget.html.php | 2 +-
 .../Resources/views/Form/repeated_row.html.php                | 2 +-
 .../TwigBundle/Resources/views/Form/div_layout.html.twig      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php
index dfd328ebf69b..c3a5977afb2e 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/field_rest.html.php
@@ -1,4 +1,4 @@
-<?php foreach ($form->getChildren() as $child): ?>
+<?php foreach ($form as $child): ?>
     <?php if (!$child->isRendered()): ?>
         <?php echo $view['form']->row($child) ?>
     <?php endif; ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php
index 33b035f9d91e..f38017fe50e7 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php
@@ -1,6 +1,6 @@
 <div<?php echo $view['form']->attributes() ?>>
     <?php echo $view['form']->errors($form); ?>
-    <?php foreach ($form->getChildren() as $child): ?>
+    <?php foreach ($form as $child): ?>
         <?php echo $view['form']->row($child); ?>
     <?php endforeach; ?>
     <?php echo $view['form']->rest($form) ?>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php
index 76a8b2add961..532fe3aca649 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/repeated_row.html.php
@@ -1,5 +1,5 @@
 <?php echo $view['form']->errors($form) ?>
 
-<?php foreach ($form->getChildren() as $child): ?>
+<?php foreach ($form as $child): ?>
     <?php echo $view['form']->row($child); ?>
 <?php endforeach; ?>
\ No newline at end of file
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig
index 5c79f07e03dd..54af1d163b6e 100644
--- a/src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig
+++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Form/div_layout.html.twig
@@ -1,7 +1,7 @@
 {% block field_rows %}
 {% spaceless %}
     {{ form_errors(form) }}
-    {% for child in form.children %}
+    {% for child in form %}
         {{ form_row(child) }}
     {% endfor %}
 {% endspaceless %}
@@ -27,7 +27,7 @@
 
 {% block field_rest %}
 {% spaceless %}
-    {% for child in form.children %}
+    {% for child in form %}
         {% if not child.rendered %}
             {{ form_row(child) }}
         {% endif %}