ChoiceType flattens nested Choices when expanded

ericclemmons · ericclemmons · commit 7a8e1b3b4852 · 2011-11-26T17:37:27.000-08:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -41,7 +41,19 @@ public function buildForm(FormBuilder $builder, array $options)
 
         if ($options['expanded']) {
             // Load choices already if expanded
-            $options['choices'] = $options['choice_list']->getChoices();
+            $choices = $options['choice_list']->getChoices();
+
+            // Flatten choices
+            $flattened = array();
+            foreach ($choices as $value => $choice) {
+                if (is_array($choice)) {
+                    $flattened = array_replace($flattened, $choice);
+                } else {
+                    $flattened[$value] = $choice;
+                }
+            }
+
+            $options['choices'] = $flattened;
 
             foreach ($options['choices'] as $choice => $value) {
                 if ($options['multiple']) {
