From df50e2b161e84f9e2489b33cd5e44214ec742f21 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Thu, 21 Apr 2011 19:57:53 -0500
Subject: [PATCH] [Form] Removing excess option in the TimezoneType

---
 src/Symfony/Component/Form/Type/TimezoneType.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/Symfony/Component/Form/Type/TimezoneType.php b/src/Symfony/Component/Form/Type/TimezoneType.php
index abcf6c68c2..5e0649ba44 100644
--- 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)