From 6f56dfc0d6b1bde8b2ab5e922c26743a03c7dbf1 Mon Sep 17 00:00:00 2001 From: William DURAND Date: Wed, 11 Apr 2012 18:56:33 +0200 Subject: [PATCH] [Form] Fixed DateType default options --- src/Symfony/Component/Form/Extension/Core/Type/DateType.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php index 51d09ce641..e58d0d9340 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php @@ -44,7 +44,7 @@ class DateType extends AbstractType // If $format is not in the allowed options, it's considered as the pattern of the formatter if it is a string if (!in_array($format, $allowedFormatOptionValues, true)) { if (is_string($format)) { - $defaultOptions = array_merge($this->getDefaultOptions(), $options); + $defaultOptions = $this->getDefaultOptions(); $format = $defaultOptions['format']; $pattern = $options['format'];