Merge 133ee57 into cd67eeb

sonata-project · May 30, 2016 · 9deec52 · 9deec52
2 parents cd67eeb + 133ee57
commit 9deec52
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Form/Type/FormatterType.php b/Form/Type/FormatterType.php
@@ -67,7 +67,10 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $options['format_field_options']['property_path'] = $formatField;
         }
 
-        $options['format_field_options']['data'] = $this->pool->getDefaultFormatter();
+        if (!array_key_exists('data', $options['format_field_options']) ||
+             !array_key_exists($options['format_field_options']['data'], $this->pool->getFormatters())) {
+            $options['format_field_options']['data'] = $this->pool->getDefaultFormatter();
+        }
 
         if (is_array($options['source_field'])) {
             list($sourceField, $sourcePropertyPath) = $options['source_field'];