diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
index 477b0f5644365..7e86fb0728a03 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
+++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/form.xml
@@ -193,7 +193,7 @@
-
+
%validator.translation_domain%
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
index 6f0fa60afd60d..d89a326f77a10 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
@@ -53,6 +53,6 @@ public function configureOptions(OptionsResolver $resolver)
*/
public function getExtendedType()
{
- return 'form';
+ return 'Symfony\Component\Form\Extension\Core\Type\FormType';
}
}