Merge remote branch 'weaverryan/form_remove_extra_timezone_options' into form
* weaverryan/form_remove_extra_timezone_options: [Form] Removing excess option in the TimezoneType
This commit is contained in:
commit
82f1461031
@ -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)
|
||||
|
Reference in New Issue
Block a user