Revert "Experimental commit"

przemyslaw-bogusz · przemyslaw-bogusz · commit 8266ce5bfda5 · 2019-06-26T01:23:19.000+02:00
This reverts commit 5a50ee8.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php b/src/Symfony/Component/Form/Extension/Core/Type/BaseType.php
@@ -47,7 +47,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $labelTranslationParameters = $options['label_translation_parameters'];
         $attrTranslationParameters = $options['attr_translation_parameters'];
         $labelFormat = $options['label_format'];
-        $labelHtml = $options['label_html'];
 
         if ($view->parent) {
             if ('' !== ($parentFullName = $view->parent->vars['full_name'])) {
@@ -70,10 +69,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             if (!$labelFormat) {
                 $labelFormat = $view->parent->vars['label_format'];
             }
-            
-            if (!$labelHtml) {
-                $labelHtml = $view->parent->vars['label_html'];
-            }
         } else {
             $id = $name;
             $fullName = $name;
@@ -102,7 +97,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
             'disabled' => $form->isDisabled(),
             'label' => $options['label'],
             'label_format' => $labelFormat,
-            'label_html' => $labelHtml,
+            'label_html' => $options['label_html'],
             'multipart' => false,
             'attr' => $options['attr'],
             'block_prefixes' => $blockPrefixes,
