[Form] Replace unset() with non-destructive logic in case the "choice…

…s" option is an object.
symfony · Sep 9, 2010 · 6fc9b68 · 6fc9b68
1 parent 50f0398
commit 6fc9b68
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Symfony/Component/Form/ChoiceField.php b/src/Symfony/Component/Form/ChoiceField.php
@@ -43,11 +43,12 @@ protected function configure()
 
             foreach ($this->getOption('preferred_choices') as $choice) {
                 $this->add($this->newChoiceField($choice, $choices[$choice]));
-                unset($choices[$choice]);
             }
 
             foreach ($this->getOption('choices') as $choice => $value) {
-                $this->add($this->newChoiceField($choice, $value));
+                if (!isset($this->preferredChoices[$choice])) {
+                    $this->add($this->newChoiceField($choice, $value));
+                }
             }
         } else {
             $this->setFieldMode(self::FIELD);