[Form] Removing excess option in the TimezoneType

2011-04-21 19:57:53 -05:00 · 2011-04-21 19:57:53 -05:00 · df50e2b161
commit df50e2b161
parent c58b05a6d6
1 changed files with 2 additions and 10 deletions
--- a/src/Symfony/Component/Form/Type/TimezoneType.php
+++ b/src/Symfony/Component/Form/Type/TimezoneType.php
@ -18,17 +18,9 @@ class TimezoneType extends AbstractType
 {
    public function getDefaultOptions(array $options)
    {
-        $defaultOptions = array(
-            'preferred_choices' => array(),
+        return array(
+            'choice_list' => new TimezoneChoiceList(),
        );
-
-        $options = array_replace($defaultOptions, $options);
-
-        if (!isset($options['choice_list'])) {
-            $defaultOptions['choice_list'] = new TimezoneChoiceList();
-        }
-
-        return $defaultOptions;
    }

    public function getParent(array $options)