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

[Form] Replace unset() with non-destructive logic in case the "choices" option is an object.

Browse Source
This commit is contained in:
Jeremy Mikola 2010-06-30 20:15:55 -04:00
parent 50f039844b
commit 6fc9b68fa7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Symfony/Component/Form/ChoiceField.php
View File

@ -43,11 +43,12 @@ class ChoiceField extends HybridField
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);